1 files changed, 20 insertions, 36 deletions
diff --git a/test/parallel/test-timers-this.js b/test/parallel/test-timers-this.js
index e21167581e..6bd4033756 100644
--- a/test/parallel/test-timers-this.js
+++ b/test/parallel/test-timers-this.js
@@ -1,45 +1,29 @@
 'use strict';
-require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
-let immediateThis, intervalThis, timeoutThis;
-let immediateArgsThis, intervalArgsThis, timeoutArgsThis;
+const immediateHandler = setImmediate(common.mustCall(function() {
+  assert.strictEqual(this, immediateHandler);
+}));
 
-var immediateHandler = setImmediate(function() {
-  immediateThis = this;
-});
+const immediateArgsHandler = setImmediate(common.mustCall(function() {
+  assert.strictEqual(this, immediateArgsHandler);
+}), 'args ...');
 
-var immediateArgsHandler = setImmediate(function() {
-  immediateArgsThis = this;
-}, 'args ...');
-
-var intervalHandler = setInterval(function() {
+const intervalHandler = setInterval(common.mustCall(function() {
   clearInterval(intervalHandler);
+  assert.strictEqual(this, intervalHandler);
+}), 1);
 
-  intervalThis = this;
-});
-
-var intervalArgsHandler = setInterval(function() {
+const intervalArgsHandler = setInterval(common.mustCall(function() {
   clearInterval(intervalArgsHandler);
+  assert.strictEqual(this, intervalArgsHandler);
+}), 1, 'args ...');
 
-  intervalArgsThis = this;
-}, 0, 'args ...');
-
-var timeoutHandler = setTimeout(function() {
-  timeoutThis = this;
-});
-
-var timeoutArgsHandler = setTimeout(function() {
-  timeoutArgsThis = this;
-}, 0, 'args ...');
-
-process.once('exit', function() {
-  assert.strictEqual(immediateThis, immediateHandler);
-  assert.strictEqual(immediateArgsThis, immediateArgsHandler);
-
-  assert.strictEqual(intervalThis, intervalHandler);
-  assert.strictEqual(intervalArgsThis, intervalArgsHandler);
+const timeoutHandler = setTimeout(common.mustCall(function() {
+  assert.strictEqual(this, timeoutHandler);
+}), 1);
 
-  assert.strictEqual(timeoutThis, timeoutHandler);
-  assert.strictEqual(timeoutArgsThis, timeoutArgsHandler);
-});
+const timeoutArgsHandler = setTimeout(common.mustCall(function() {
+  assert.strictEqual(this, timeoutArgsHandler);
+}), 1, 'args ...');