diff --git a/test/parallel/test-http-remove-header-stays-removed.js b/test/parallel/test-http-remove-header-stays-removed.js
index 17e9db976c0..40dcbce73e7 100644
--- a/test/parallel/test-http-remove-header-stays-removed.js
+++ b/test/parallel/test-http-remove-header-stays-removed.js
@@ -25,7 +25,9 @@ const assert = require('assert');
 
 const http = require('http');
 
-const server = http.createServer(function(request, response) {
+const server = http.createServer(common.mustCall(function(request, response) {
+  const socket = response.socket;
+
   // Removed headers should stay removed, even if node automatically adds them
   // to the output:
   response.removeHeader('connection');
@@ -36,32 +38,29 @@ const server = http.createServer(function(request, response) {
   response.removeHeader('date');
   response.setHeader('date', 'coffee o clock');
 
+  response.on('finish', common.mustCall(function() {
+    // The socket should be closed immediately, with no keep-alive, because
+    // no content-length or transfer-encoding are used.
+    assert.strictEqual(socket.writableEnded, true);
+  }));
+
   response.end('beep boop\n');
-});
-
-let response = '';
-
-process.on('exit', function() {
-  assert.strictEqual(response, 'beep boop\n');
-  console.log('ok');
-});
+}));
 
 server.listen(0, function() {
   http.get({ port: this.address().port }, function(res) {
     assert.strictEqual(res.statusCode, 200);
     assert.deepStrictEqual(res.headers, { date: 'coffee o clock' });
 
+    let response = '';
     res.setEncoding('ascii');
     res.on('data', function(chunk) {
       response += chunk;
-      if (response === 'beep boop\n') {
-        setTimeout(function() {
-          // The socket should be closed immediately, with no keep-alive, because
-          // no content-length or transfer-encoding are used:
-          assert.strictEqual(res.socket.closed, true);
-          server.close();
-        }, common.platformTimeout(15));
-      }
+    });
+
+    res.on('end', function() {
+      assert.strictEqual(response, 'beep boop\n');
+      server.close();
     });
   });
 });