diff --git a/test/fixtures/empty.js b/test/fixtures/empty.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/pummel/test-debugger-debug-brk.js b/test/pummel/test-debugger-debug-brk.js
new file mode 100644
index 0000000000..eabef593c4
--- /dev/null
+++ b/test/pummel/test-debugger-debug-brk.js
@@ -0,0 +1,49 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+var common = require('../common');
+var assert = require('assert');
+var spawn = require('child_process').spawn;
+
+var script = common.fixturesDir + '/empty.js';
+
+function fail() {
+  assert(0); // `node --debug-brk script.js` should not quit
+}
+
+function test(arg) {
+  var child = spawn(process.execPath, [arg, script]);
+  child.on('exit', fail);
+
+  // give node time to start up the debugger
+  setTimeout(function() {
+    child.removeListener('exit', fail);
+    child.kill();
+  }, 2000);
+
+  process.on('exit', function() {
+    assert(child.killed);
+  });
+}
+
+test('--debug-brk');
+test('--debug-brk=5959');