diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
index f29f7a647a4..51b7f928cb2 100644
--- a/lib/internal/bootstrap_node.js
+++ b/lib/internal/bootstrap_node.js
@@ -400,13 +400,9 @@
                    'return require("vm").runInThisContext(' +
                    `${JSON.stringify(body)}, { filename: ` +
                    `${JSON.stringify(name)}, displayErrors: true });\n`;
-    // Defer evaluation for a tick.  This is a workaround for deferred
-    // events not firing when evaluating scripts from the command line,
-    // see https://github.com/nodejs/node/issues/1600.
-    setImmediate(function() {
-      const result = module._compile(script, `${name}-wrapper`);
-      if (process._print_eval) console.log(result);
-    });
+    const result = module._compile(script, `${name}-wrapper`);
+    if (process._print_eval) console.log(result);
+    process._tickCallback();
   }
 
   // Load preload modules
diff --git a/test/message/eval_messages.out b/test/message/eval_messages.out
index ba0c35431c6..340e760dc69 100644
--- a/test/message/eval_messages.out
+++ b/test/message/eval_messages.out
@@ -3,14 +3,15 @@
 with(this){__filename}
 ^^^^
 SyntaxError: Strict mode code may not include a with statement
-    at createScript (vm.js:*)
-    at Object.runInThisContext (vm.js:*)
+    at createScript (vm.js:*:*)
+    at Object.runInThisContext (vm.js:*:*)
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at Immediate.<anonymous> (bootstrap_node.js:*:*)
-    at runCallback (timers.js:*:*)
-    at tryOnImmediate (timers.js:*:*)
-    at processImmediate [as _immediateCallback] (timers.js:*:*)
+    at evalScript (bootstrap_node.js:*:*)
+    at run (bootstrap_node.js:*:*)
+    at run (bootstrap_node.js:*:*)
+    at startup (bootstrap_node.js:*:*)
+    at bootstrap_node.js:*:*
 42
 42
 [eval]:1
@@ -19,28 +20,31 @@ throw new Error("hello")
 
 Error: hello
     at [eval]:1:7
-    at ContextifyScript.Script.runInThisContext (vm.js:*)
-    at Object.runInThisContext (vm.js:*)
+    at ContextifyScript.Script.runInThisContext (vm.js:*:*)
+    at Object.runInThisContext (vm.js:*:*)
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at Immediate.<anonymous> (bootstrap_node.js:*:*)
-    at runCallback (timers.js:*:*)
-    at tryOnImmediate (timers.js:*:*)
-    at processImmediate [as _immediateCallback] (timers.js:*:*)
+    at evalScript (bootstrap_node.js:*:*)
+    at run (bootstrap_node.js:*:*)
+    at run (bootstrap_node.js:*:*)
+    at startup (bootstrap_node.js:*:*)
+    at bootstrap_node.js:*:*
+
 [eval]:1
 throw new Error("hello")
 ^
 
 Error: hello
     at [eval]:1:7
-    at ContextifyScript.Script.runInThisContext (vm.js:*)
-    at Object.runInThisContext (vm.js:*)
+    at ContextifyScript.Script.runInThisContext (vm.js:*:*)
+    at Object.runInThisContext (vm.js:*:*)
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at Immediate.<anonymous> (bootstrap_node.js:*:*)
-    at runCallback (timers.js:*:*)
-    at tryOnImmediate (timers.js:*:*)
-    at processImmediate [as _immediateCallback] (timers.js:*:*)
+    at evalScript (bootstrap_node.js:*:*)
+    at run (bootstrap_node.js:*:*)
+    at run (bootstrap_node.js:*:*)
+    at startup (bootstrap_node.js:*:*)
+    at bootstrap_node.js:*:*
 100
 [eval]:1
 var x = 100; y = x;
@@ -48,14 +52,15 @@ var x = 100; y = x;
 
 ReferenceError: y is not defined
     at [eval]:1:16
-    at ContextifyScript.Script.runInThisContext (vm.js:*)
-    at Object.runInThisContext (vm.js:*)
+    at ContextifyScript.Script.runInThisContext (vm.js:*:*)
+    at Object.runInThisContext (vm.js:*:*)
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at Immediate.<anonymous> (bootstrap_node.js:*:*)
-    at runCallback (timers.js:*:*)
-    at tryOnImmediate (timers.js:*:*)
-    at processImmediate [as _immediateCallback] (timers.js:*:*)
+    at evalScript (bootstrap_node.js:*:*)
+    at run (bootstrap_node.js:*:*)
+    at run (bootstrap_node.js:*:*)
+    at startup (bootstrap_node.js:*:*)
+    at bootstrap_node.js:*:*
 
 [eval]:1
 var ______________________________________________; throw 10
diff --git a/test/message/stdin_messages.out b/test/message/stdin_messages.out
index b4c51d7ad56..ad1688f15d0 100644
--- a/test/message/stdin_messages.out
+++ b/test/message/stdin_messages.out
@@ -7,10 +7,12 @@ SyntaxError: Strict mode code may not include a with statement
     at Object.runInThisContext (vm.js:*)
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at Immediate.<anonymous> (bootstrap_node.js:*:*)
-    at runCallback (timers.js:*:*)
-    at tryOnImmediate (timers.js:*:*)
-    at processImmediate [as _immediateCallback] (timers.js:*:*)
+    at evalScript (bootstrap_node.js:*:*)
+    at Socket.<anonymous> (bootstrap_node.js:*:*)
+    at emitNone (events.js:*:*)
+    at Socket.emit (events.js:*:*)
+    at endReadableNT (_stream_readable.js:*:*)
+    at _combinedTickCallback (internal/process/next_tick.js:*:*)
 42
 42
 [stdin]:1
@@ -23,10 +25,11 @@ Error: hello
     at Object.runInThisContext (vm.js:*)
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at Immediate.<anonymous> (bootstrap_node.js:*:*)
-    at runCallback (timers.js:*:*)
-    at tryOnImmediate (timers.js:*:*)
-    at processImmediate [as _immediateCallback] (timers.js:*:*)
+    at evalScript (bootstrap_node.js:*:*)
+    at Socket.<anonymous> (bootstrap_node.js:*:*)
+    at emitNone (events.js:*:*)
+    at Socket.emit (events.js:*:*)
+    at endReadableNT (_stream_readable.js:*:*)
 [stdin]:1
 throw new Error("hello")
 ^
@@ -37,10 +40,11 @@ Error: hello
     at Object.runInThisContext (vm.js:*)
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at Immediate.<anonymous> (bootstrap_node.js:*:*)
-    at runCallback (timers.js:*:*)
-    at tryOnImmediate (timers.js:*:*)
-    at processImmediate [as _immediateCallback] (timers.js:*:*)
+    at evalScript (bootstrap_node.js:*:*)
+    at Socket.<anonymous> (bootstrap_node.js:*:*)
+    at emitNone (events.js:*:*)
+    at Socket.emit (events.js:*:*)
+    at endReadableNT (_stream_readable.js:*:*)
 100
 [stdin]:1
 var x = 100; y = x;
@@ -52,10 +56,11 @@ ReferenceError: y is not defined
     at Object.runInThisContext (vm.js:*)
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at Immediate.<anonymous> (bootstrap_node.js:*:*)
-    at runCallback (timers.js:*:*)
-    at tryOnImmediate (timers.js:*:*)
-    at processImmediate [as _immediateCallback] (timers.js:*:*)
+    at evalScript (bootstrap_node.js:*:*)
+    at Socket.<anonymous> (bootstrap_node.js:*:*)
+    at emitNone (events.js:*:*)
+    at Socket.emit (events.js:*:*)
+    at endReadableNT (_stream_readable.js:*:*)
 
 [stdin]:1
 var ______________________________________________; throw 10
diff --git a/test/parallel/test-cli-eval.js b/test/parallel/test-cli-eval.js
index 6d21b5d50be..34681bd235c 100644
--- a/test/parallel/test-cli-eval.js
+++ b/test/parallel/test-cli-eval.js
@@ -171,6 +171,25 @@ child.exec(`${nodejs} --use-strict -p process.execArgv`,
   assert.strictEqual(proc.stdout, 'start\nbeforeExit\nexit\n');
 }
 
+// Regression test for https://github.com/nodejs/node/issues/11948.
+{
+  const script = `
+      process.on('message', (message) => {
+        if (message === 'ping') process.send('pong');
+        if (message === 'exit') process.disconnect();
+      });
+  `;
+  const proc = child.fork('-e', [script]);
+  proc.on('exit', common.mustCall((exitCode, signalCode) => {
+    assert.strictEqual(exitCode, 0);
+    assert.strictEqual(signalCode, null);
+  }));
+  proc.on('message', (message) => {
+    if (message === 'pong') proc.send('exit');
+  });
+  proc.send('ping');
+}
+
 [ '-arg1',
   '-arg1 arg2 --arg3',
   '--',