diff --git a/lib/_debug_agent.js b/lib/_debug_agent.js
index 03d3c1c472ec09..eedca7ef5843bb 100644
--- a/lib/_debug_agent.js
+++ b/lib/_debug_agent.js
@@ -51,9 +51,8 @@ function Agent() {
   this.binding = process._debugAPI;
   assert(this.binding, 'Debugger agent running without bindings!');
 
-  var self = this;
-  this.binding.onmessage = function(msg) {
-    self.clients.forEach(function(client) {
+  this.binding.onmessage = (msg) => {
+    this.clients.forEach((client) => {
       client.send({}, msg);
     });
   };
@@ -68,11 +67,10 @@ Agent.prototype.onConnection = function onConnection(socket) {
   c.start();
   this.clients.push(c);
 
-  var self = this;
-  c.once('close', function() {
-    var index = self.clients.indexOf(c);
+  c.once('close', () => {
+    var index = this.clients.indexOf(c);
     assert(index !== -1);
-    self.clients.splice(index, 1);
+    this.clients.splice(index, 1);
   });
 };
 
@@ -99,9 +97,8 @@ function Client(agent, socket) {
 
   this.on('data', this.onCommand);
 
-  var self = this;
-  this.socket.on('close', function() {
-    self.destroy();
+  this.socket.on('close', () => {
+    this.destroy();
   });
 }
 util.inherits(Client, Transform);