diff --git a/lib/_debugger.js b/lib/_debugger.js
index dcf046bcf5..64ea20df6e 100644
--- a/lib/_debugger.js
+++ b/lib/_debugger.js
@@ -747,15 +747,18 @@ function Interface(stdin, stdout, args) {
 
   // Two eval modes are available: controlEval and debugEval
   // But controlEval is used by default
-  this.repl = repl.start({
+  var opts = {
     prompt: 'debug> ',
     input: this.stdin,
     output: this.stdout,
-    terminal: !parseInt(process.env['NODE_NO_READLINE'], 10),
     eval: this.controlEval.bind(this),
     useGlobal: false,
     ignoreUndefined: true
-  });
+  };
+  if (parseInt(process.env['NODE_NO_READLINE'], 10)) {
+    opts.terminal = false;
+  }
+  this.repl = repl.start(opts);
 
   // Do not print useless warning
   repl._builtinLibs.splice(repl._builtinLibs.indexOf('repl'), 1);
diff --git a/src/node.js b/src/node.js
index fad3845564..512a647dad 100644
--- a/src/node.js
+++ b/src/node.js
@@ -121,12 +121,14 @@
       // If -i or --interactive were passed, or stdin is a TTY.
       if (process._forceRepl || NativeModule.require('tty').isatty(0)) {
         // REPL
-        var repl = Module.requireRepl().start({
-          prompt: '> ',
-          terminal: !parseInt(process.env['NODE_NO_READLINE'], 10),
+        var opts = {
           useGlobal: true,
           ignoreUndefined: false
-        });
+        };
+        if (parseInt(process.env['NODE_NO_READLINE'], 10)) {
+          opts.terminal = false;
+        }
+        var repl = Module.requireRepl().start(opts);
         repl.on('exit', function() {
           process.exit();
         });