diff --git a/Makefile b/Makefile
index fbd8b2b0ae..0406b1d72f 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,9 @@ test-pummel: all
 test-internet: all
 	$(PYTHON) tools/test.py internet
 
+test-debugger: all
+	$(PYTHON) tools/test.py debugger
+
 test-npm: node
 	./node deps/npm/test/run.js
 
diff --git a/test/simple/helper-debugger-repl.js b/test/debugger/helper-debugger-repl.js
similarity index 100%
rename from test/simple/helper-debugger-repl.js
rename to test/debugger/helper-debugger-repl.js
diff --git a/test/pummel/test-debug-break-on-uncaught.js b/test/debugger/test-debug-break-on-uncaught.js
similarity index 100%
rename from test/pummel/test-debug-break-on-uncaught.js
rename to test/debugger/test-debug-break-on-uncaught.js
diff --git a/test/simple/test-debugger-client.js b/test/debugger/test-debugger-client.js
similarity index 100%
rename from test/simple/test-debugger-client.js
rename to test/debugger/test-debugger-client.js
diff --git a/test/pummel/test-debugger-debug-brk.js b/test/debugger/test-debugger-debug-brk.js
similarity index 100%
rename from test/pummel/test-debugger-debug-brk.js
rename to test/debugger/test-debugger-debug-brk.js
diff --git a/test/pummel/test-debugger-repl-break-in-module.js b/test/debugger/test-debugger-repl-break-in-module.js
similarity index 97%
rename from test/pummel/test-debugger-repl-break-in-module.js
rename to test/debugger/test-debugger-repl-break-in-module.js
index 47b4311ceb..1fe0aba841 100644
--- a/test/pummel/test-debugger-repl-break-in-module.js
+++ b/test/debugger/test-debugger-repl-break-in-module.js
@@ -19,7 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-var repl = require('../simple/helper-debugger-repl.js');
+var repl = require('./helper-debugger-repl.js');
 
 repl.startDebugger('break-in-module/main.js');
 
diff --git a/test/simple/test-debugger-repl-restart.js b/test/debugger/test-debugger-repl-restart.js
similarity index 100%
rename from test/simple/test-debugger-repl-restart.js
rename to test/debugger/test-debugger-repl-restart.js
diff --git a/test/simple/test-debugger-repl-term.js b/test/debugger/test-debugger-repl-term.js
similarity index 100%
rename from test/simple/test-debugger-repl-term.js
rename to test/debugger/test-debugger-repl-term.js
diff --git a/test/simple/test-debugger-repl-utf8.js b/test/debugger/test-debugger-repl-utf8.js
similarity index 100%
rename from test/simple/test-debugger-repl-utf8.js
rename to test/debugger/test-debugger-repl-utf8.js
diff --git a/test/simple/test-debugger-repl.js b/test/debugger/test-debugger-repl.js
similarity index 100%
rename from test/simple/test-debugger-repl.js
rename to test/debugger/test-debugger-repl.js
diff --git a/test/debugger/testcfg.py b/test/debugger/testcfg.py
new file mode 100644
index 0000000000..4aee90b3eb
--- /dev/null
+++ b/test/debugger/testcfg.py
@@ -0,0 +1,6 @@
+import sys, os
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+import testpy
+
+def GetConfiguration(context, root):
+  return testpy.SimpleTestConfiguration(context, root, 'debugger')
diff --git a/tools/test.py b/tools/test.py
index c82d4acb4c..0772f9ad32 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1322,7 +1322,14 @@ def GetSpecialCommandProcessor(value):
     return ExpandCommand
 
 
-BUILT_IN_TESTS = ['simple', 'pummel', 'message', 'internet', 'gc']
+BUILT_IN_TESTS = [
+  'simple',
+  'pummel',
+  'message',
+  'internet',
+  'gc',
+  'debugger',
+]
 
 
 def GetSuites(test_root):