775 files changed, 41 insertions, 78 deletions

diff --git a/Makefile b/Makefile
index 46dca45f64..114d198c9e 100644
--- a/Makefile
+++ b/Makefile
@@ -90,15 +90,18 @@ distclean:
 	-rm -rf node_modules
 
 test: all
-	$(PYTHON) tools/test.py --mode=release simple message
+	$(PYTHON) tools/test.py --mode=release message parallel sequential
 	$(MAKE) jslint
 	$(MAKE) cpplint
 
+test-parallel: all
+	$(PYTHON) tools/test.py --mode=release parallel -J
+
 test-http1: all
-	$(PYTHON) tools/test.py --mode=release --use-http1 simple message
+	$(PYTHON) tools/test.py --mode=release --use-http1 sequential parallel message
 
 test-valgrind: all
-	$(PYTHON) tools/test.py --mode=release --valgrind simple message
+	$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
 
 test/gc/node_modules/weak/build/Release/weakref.node:
 	@if [ ! -f $(NODE_EXE) ]; then make all; fi
@@ -141,7 +144,7 @@ test-message: test-build
 	$(PYTHON) tools/test.py message
 
 test-simple: all
-	$(PYTHON) tools/test.py simple
+	$(PYTHON) tools/test.py parallel sequential
 
 test-pummel: all wrk
 	$(PYTHON) tools/test.py pummel
diff --git a/test/simple/path.js b/test/fixtures/path.js
index 21c08d3c6b..21c08d3c6b 100644
--- a/test/simple/path.js
+++ b/test/fixtures/path.js
diff --git a/test/simple/simple.status b/test/parallel/simple.status
index d310575f1b..d310575f1b 100644
--- a/test/simple/simple.status
+++ b/test/parallel/simple.status
diff --git a/test/simple/test-assert.js b/test/parallel/test-assert.js
index 84ea9249c5..84ea9249c5 100644
--- a/test/simple/test-assert.js
+++ b/test/parallel/test-assert.js
diff --git a/test/simple/test-bad-unicode.js b/test/parallel/test-bad-unicode.js
index 0e57909a60..0e57909a60 100644
--- a/test/simple/test-bad-unicode.js
+++ b/test/parallel/test-bad-unicode.js
diff --git a/test/simple/test-beforeexit-event-exit.js b/test/parallel/test-beforeexit-event-exit.js
index be6f2c607c..be6f2c607c 100644
--- a/test/simple/test-beforeexit-event-exit.js
+++ b/test/parallel/test-beforeexit-event-exit.js
diff --git a/test/simple/test-beforeexit-event.js b/test/parallel/test-beforeexit-event.js
index 41cc1d3766..d1e2093543 100644
--- a/test/simple/test-beforeexit-event.js
+++ b/test/parallel/test-beforeexit-event.js
@@ -22,6 +22,7 @@
 var assert = require('assert');
 var net = require('net');
 var util = require('util');
+var common = require('../common');
 var revivals = 0;
 var deaths = 0;
 
@@ -49,7 +50,7 @@ function tryTimer() {
 function tryListen() {
   console.log('create a server');
   net.createServer()
-    .listen(0)
+    .listen(common.PORT)
     .on('listening', function() {
       revivals++;
       this.close();
diff --git a/test/simple/test-buffer-ascii.js b/test/parallel/test-buffer-ascii.js
index 784597a48e..784597a48e 100644
--- a/test/simple/test-buffer-ascii.js
+++ b/test/parallel/test-buffer-ascii.js
diff --git a/test/simple/test-buffer-concat.js b/test/parallel/test-buffer-concat.js
index 858d6924f9..858d6924f9 100644
--- a/test/simple/test-buffer-concat.js
+++ b/test/parallel/test-buffer-concat.js
diff --git a/test/simple/test-buffer-inspect.js b/test/parallel/test-buffer-inspect.js
index a13c69b4e0..a13c69b4e0 100644
--- a/test/simple/test-buffer-inspect.js
+++ b/test/parallel/test-buffer-inspect.js
diff --git a/test/simple/test-buffer-slice.js b/test/parallel/test-buffer-slice.js
index 1a462bd0be..1a462bd0be 100644
--- a/test/simple/test-buffer-slice.js
+++ b/test/parallel/test-buffer-slice.js
diff --git a/test/simple/test-buffer.js b/test/parallel/test-buffer.js
index bf742f9348..bf742f9348 100644
--- a/test/simple/test-buffer.js
+++ b/test/parallel/test-buffer.js
diff --git a/test/simple/test-c-ares.js b/test/parallel/test-c-ares.js
index 3a3a9223d8..3a3a9223d8 100644
--- a/test/simple/test-c-ares.js
+++ b/test/parallel/test-c-ares.js
diff --git a/test/simple/test-child-process-buffering.js b/test/parallel/test-child-process-buffering.js
index 3fb13b6208..3fb13b6208 100644
--- a/test/simple/test-child-process-buffering.js
+++ b/test/parallel/test-child-process-buffering.js
diff --git a/test/simple/test-child-process-cwd.js b/test/parallel/test-child-process-cwd.js
index b06e8e4793..b06e8e4793 100644
--- a/test/simple/test-child-process-cwd.js
+++ b/test/parallel/test-child-process-cwd.js
diff --git a/test/simple/test-child-process-default-options.js b/test/parallel/test-child-process-default-options.js
index 57ff60441c..57ff60441c 100644
--- a/test/simple/test-child-process-default-options.js
+++ b/test/parallel/test-child-process-default-options.js
diff --git a/test/simple/test-child-process-detached.js b/test/parallel/test-child-process-detached.js
index 10ce5d1527..10ce5d1527 100644
--- a/test/simple/test-child-process-detached.js
+++ b/test/parallel/test-child-process-detached.js
diff --git a/test/simple/test-child-process-disconnect.js b/test/parallel/test-child-process-disconnect.js
index 5902be8f1e..5902be8f1e 100644
--- a/test/simple/test-child-process-disconnect.js
+++ b/test/parallel/test-child-process-disconnect.js
diff --git a/test/simple/test-child-process-double-pipe.js b/test/parallel/test-child-process-double-pipe.js
index c09dfa8853..c09dfa8853 100644
--- a/test/simple/test-child-process-double-pipe.js
+++ b/test/parallel/test-child-process-double-pipe.js
diff --git a/test/simple/test-child-process-env.js b/test/parallel/test-child-process-env.js
index caeb1936c2..caeb1936c2 100644
--- a/test/simple/test-child-process-env.js
+++ b/test/parallel/test-child-process-env.js
diff --git a/test/simple/test-child-process-exec-buffer.js b/test/parallel/test-child-process-exec-buffer.js
index 937dce76e6..937dce76e6 100644
--- a/test/simple/test-child-process-exec-buffer.js
+++ b/test/parallel/test-child-process-exec-buffer.js
diff --git a/test/simple/test-child-process-exec-cwd.js b/test/parallel/test-child-process-exec-cwd.js
index 282faec8ba..282faec8ba 100644
--- a/test/simple/test-child-process-exec-cwd.js
+++ b/test/parallel/test-child-process-exec-cwd.js
diff --git a/test/simple/test-child-process-exec-env.js b/test/parallel/test-child-process-exec-env.js
index b14ce741fe..b14ce741fe 100644
--- a/test/simple/test-child-process-exec-env.js
+++ b/test/parallel/test-child-process-exec-env.js
diff --git a/test/simple/test-child-process-exec-error.js b/test/parallel/test-child-process-exec-error.js
index afe1997643..afe1997643 100644
--- a/test/simple/test-child-process-exec-error.js
+++ b/test/parallel/test-child-process-exec-error.js
diff --git a/test/simple/test-child-process-exit-code.js b/test/parallel/test-child-process-exit-code.js
index c0c25858bb..c0c25858bb 100644
--- a/test/simple/test-child-process-exit-code.js
+++ b/test/parallel/test-child-process-exit-code.js
diff --git a/test/simple/test-child-process-fork-and-spawn.js b/test/parallel/test-child-process-fork-and-spawn.js
index 989bf7ee3a..989bf7ee3a 100644
--- a/test/simple/test-child-process-fork-and-spawn.js
+++ b/test/parallel/test-child-process-fork-and-spawn.js
diff --git a/test/simple/test-child-process-fork-close.js b/test/parallel/test-child-process-fork-close.js
index 342cffec3c..342cffec3c 100644
--- a/test/simple/test-child-process-fork-close.js
+++ b/test/parallel/test-child-process-fork-close.js
diff --git a/test/simple/test-child-process-fork-dgram.js b/test/parallel/test-child-process-fork-dgram.js
index 1c4e9acc3b..1c4e9acc3b 100644
--- a/test/simple/test-child-process-fork-dgram.js
+++ b/test/parallel/test-child-process-fork-dgram.js
diff --git a/test/simple/test-child-process-fork-exec-argv.js b/test/parallel/test-child-process-fork-exec-argv.js
index d0da341c24..d0da341c24 100644
--- a/test/simple/test-child-process-fork-exec-argv.js
+++ b/test/parallel/test-child-process-fork-exec-argv.js
diff --git a/test/simple/test-child-process-fork-exec-path.js b/test/parallel/test-child-process-fork-exec-path.js
index e0cf77c28e..e0cf77c28e 100755
--- a/test/simple/test-child-process-fork-exec-path.js
+++ b/test/parallel/test-child-process-fork-exec-path.js
diff --git a/test/simple/test-child-process-fork-net.js b/test/parallel/test-child-process-fork-net.js
index feb2588fe2..feb2588fe2 100644
--- a/test/simple/test-child-process-fork-net.js
+++ b/test/parallel/test-child-process-fork-net.js
diff --git a/test/simple/test-child-process-fork-net2.js b/test/parallel/test-child-process-fork-net2.js
index 098870d48e..098870d48e 100644
--- a/test/simple/test-child-process-fork-net2.js
+++ b/test/parallel/test-child-process-fork-net2.js
diff --git a/test/simple/test-child-process-fork-ref.js b/test/parallel/test-child-process-fork-ref.js
index 21954ec733..21954ec733 100644
--- a/test/simple/test-child-process-fork-ref.js
+++ b/test/parallel/test-child-process-fork-ref.js
diff --git a/test/simple/test-child-process-fork-ref2.js b/test/parallel/test-child-process-fork-ref2.js
index 3d604142bb..3d604142bb 100644
--- a/test/simple/test-child-process-fork-ref2.js
+++ b/test/parallel/test-child-process-fork-ref2.js
diff --git a/test/simple/test-child-process-fork.js b/test/parallel/test-child-process-fork.js
index 41cc28c72e..41cc28c72e 100644
--- a/test/simple/test-child-process-fork.js
+++ b/test/parallel/test-child-process-fork.js
diff --git a/test/simple/test-child-process-fork3.js b/test/parallel/test-child-process-fork3.js
index 0f75b029e3..0f75b029e3 100644
--- a/test/simple/test-child-process-fork3.js
+++ b/test/parallel/test-child-process-fork3.js
diff --git a/test/simple/test-child-process-internal.js b/test/parallel/test-child-process-internal.js
index dd7ce556b5..dd7ce556b5 100644
--- a/test/simple/test-child-process-internal.js
+++ b/test/parallel/test-child-process-internal.js
diff --git a/test/simple/test-child-process-ipc.js b/test/parallel/test-child-process-ipc.js
index e8144e439d..e8144e439d 100644
--- a/test/simple/test-child-process-ipc.js
+++ b/test/parallel/test-child-process-ipc.js
diff --git a/test/simple/test-child-process-kill.js b/test/parallel/test-child-process-kill.js
index 08a0185d33..08a0185d33 100644
--- a/test/simple/test-child-process-kill.js
+++ b/test/parallel/test-child-process-kill.js
diff --git a/test/simple/test-child-process-recv-handle.js b/test/parallel/test-child-process-recv-handle.js
index dce5bdcbaf..dce5bdcbaf 100644
--- a/test/simple/test-child-process-recv-handle.js
+++ b/test/parallel/test-child-process-recv-handle.js
diff --git a/test/simple/test-child-process-send-utf8.js b/test/parallel/test-child-process-send-utf8.js
index b3ce24390e..b3ce24390e 100644
--- a/test/simple/test-child-process-send-utf8.js
+++ b/test/parallel/test-child-process-send-utf8.js
diff --git a/test/simple/test-child-process-set-blocking.js b/test/parallel/test-child-process-set-blocking.js
index e07c6cc4db..e07c6cc4db 100644
--- a/test/simple/test-child-process-set-blocking.js
+++ b/test/parallel/test-child-process-set-blocking.js
diff --git a/test/simple/test-child-process-silent.js b/test/parallel/test-child-process-silent.js
index e34daa3a83..e34daa3a83 100644
--- a/test/simple/test-child-process-silent.js
+++ b/test/parallel/test-child-process-silent.js
diff --git a/test/simple/test-child-process-spawn-error.js b/test/parallel/test-child-process-spawn-error.js
index 5ecfbff263..5ecfbff263 100644
--- a/test/simple/test-child-process-spawn-error.js
+++ b/test/parallel/test-child-process-spawn-error.js
diff --git a/test/simple/test-child-process-spawn-typeerror.js b/test/parallel/test-child-process-spawn-typeerror.js
index 4fd360a3f8..4fd360a3f8 100644
--- a/test/simple/test-child-process-spawn-typeerror.js
+++ b/test/parallel/test-child-process-spawn-typeerror.js
diff --git a/test/simple/test-child-process-spawnsync-env.js b/test/parallel/test-child-process-spawnsync-env.js
index 0cde9ffeef..0cde9ffeef 100644
--- a/test/simple/test-child-process-spawnsync-env.js
+++ b/test/parallel/test-child-process-spawnsync-env.js
diff --git a/test/simple/test-child-process-spawnsync-input.js b/test/parallel/test-child-process-spawnsync-input.js
index 66b2fa354a..66b2fa354a 100644
--- a/test/simple/test-child-process-spawnsync-input.js
+++ b/test/parallel/test-child-process-spawnsync-input.js
diff --git a/test/simple/test-child-process-spawnsync-timeout.js b/test/parallel/test-child-process-spawnsync-timeout.js
index 691f58786e..691f58786e 100644
--- a/test/simple/test-child-process-spawnsync-timeout.js
+++ b/test/parallel/test-child-process-spawnsync-timeout.js
diff --git a/test/simple/test-child-process-spawnsync.js b/test/parallel/test-child-process-spawnsync.js
index a7cbb8d1df..a7cbb8d1df 100644
--- a/test/simple/test-child-process-spawnsync.js
+++ b/test/parallel/test-child-process-spawnsync.js
diff --git a/test/simple/test-child-process-stdin-ipc.js b/test/parallel/test-child-process-stdin-ipc.js
index cd6a921d00..cd6a921d00 100644
--- a/test/simple/test-child-process-stdin-ipc.js
+++ b/test/parallel/test-child-process-stdin-ipc.js
diff --git a/test/simple/test-child-process-stdin.js b/test/parallel/test-child-process-stdin.js
index fdb40cc82c..fdb40cc82c 100644
--- a/test/simple/test-child-process-stdin.js
+++ b/test/parallel/test-child-process-stdin.js
diff --git a/test/simple/test-child-process-stdio-big-write-end.js b/test/parallel/test-child-process-stdio-big-write-end.js
index 845a23e661..845a23e661 100644
--- a/test/simple/test-child-process-stdio-big-write-end.js
+++ b/test/parallel/test-child-process-stdio-big-write-end.js
diff --git a/test/simple/test-child-process-stdio-inherit.js b/test/parallel/test-child-process-stdio-inherit.js
index f7776fecb9..f7776fecb9 100644
--- a/test/simple/test-child-process-stdio-inherit.js
+++ b/test/parallel/test-child-process-stdio-inherit.js
diff --git a/test/simple/test-child-process-stdio.js b/test/parallel/test-child-process-stdio.js
index 32da15f5f5..32da15f5f5 100644
--- a/test/simple/test-child-process-stdio.js
+++ b/test/parallel/test-child-process-stdio.js
diff --git a/test/simple/test-child-process-stdout-flush-exit.js b/test/parallel/test-child-process-stdout-flush-exit.js
index 49a0ec0e5f..49a0ec0e5f 100644
--- a/test/simple/test-child-process-stdout-flush-exit.js
+++ b/test/parallel/test-child-process-stdout-flush-exit.js
diff --git a/test/simple/test-child-process-stdout-flush.js b/test/parallel/test-child-process-stdout-flush.js
index adb33f5c03..adb33f5c03 100644
--- a/test/simple/test-child-process-stdout-flush.js
+++ b/test/parallel/test-child-process-stdout-flush.js
diff --git a/test/simple/test-cli-eval.js b/test/parallel/test-cli-eval.js
index d265601e8b..d055ad5e30 100644
--- a/test/simple/test-cli-eval.js
+++ b/test/parallel/test-cli-eval.js
@@ -73,7 +73,7 @@ child.exec(nodejs + ' --eval "require(\'' + filename + '\')"',
     });
 
 // module path resolve bug, regression test
-child.exec(nodejs + ' --eval "require(\'./test/simple/test-cli-eval.js\')"',
+child.exec(nodejs + ' --eval "require(\'./test/parallel/test-cli-eval.js\')"',
     function(status, stdout, stderr) {
       assert.equal(status.code, 42);
     });
diff --git a/test/simple/test-cluster-basic.js b/test/parallel/test-cluster-basic.js
index e6adfb5bad..e6adfb5bad 100644
--- a/test/simple/test-cluster-basic.js
+++ b/test/parallel/test-cluster-basic.js
diff --git a/test/simple/test-cluster-bind-privileged-port.js b/test/parallel/test-cluster-bind-privileged-port.js
index b767577289..b767577289 100644
--- a/test/simple/test-cluster-bind-privileged-port.js
+++ b/test/parallel/test-cluster-bind-privileged-port.js
diff --git a/test/simple/test-cluster-bind-twice.js b/test/parallel/test-cluster-bind-twice.js
index 311bc60faa..311bc60faa 100644
--- a/test/simple/test-cluster-bind-twice.js
+++ b/test/parallel/test-cluster-bind-twice.js
diff --git a/test/simple/test-cluster-dgram-1.js b/test/parallel/test-cluster-dgram-1.js
index c6dc095d08..c6dc095d08 100644
--- a/test/simple/test-cluster-dgram-1.js
+++ b/test/parallel/test-cluster-dgram-1.js
diff --git a/test/simple/test-cluster-dgram-2.js b/test/parallel/test-cluster-dgram-2.js
index cb5eaf0675..cb5eaf0675 100644
--- a/test/simple/test-cluster-dgram-2.js
+++ b/test/parallel/test-cluster-dgram-2.js
diff --git a/test/simple/test-cluster-disconnect-idle-worker.js b/test/parallel/test-cluster-disconnect-idle-worker.js
index 9c79ad779e..9c79ad779e 100644
--- a/test/simple/test-cluster-disconnect-idle-worker.js
+++ b/test/parallel/test-cluster-disconnect-idle-worker.js
diff --git a/test/simple/test-cluster-disconnect-with-no-workers.js b/test/parallel/test-cluster-disconnect-with-no-workers.js
index 48e3b09259..48e3b09259 100644
--- a/test/simple/test-cluster-disconnect-with-no-workers.js
+++ b/test/parallel/test-cluster-disconnect-with-no-workers.js
diff --git a/test/simple/test-cluster-disconnect.js b/test/parallel/test-cluster-disconnect.js
index 797c17d767..797c17d767 100644
--- a/test/simple/test-cluster-disconnect.js
+++ b/test/parallel/test-cluster-disconnect.js
diff --git a/test/simple/test-cluster-eaccess.js b/test/parallel/test-cluster-eaccess.js
index d5584242ce..d5584242ce 100644
--- a/test/simple/test-cluster-eaccess.js
+++ b/test/parallel/test-cluster-eaccess.js
diff --git a/test/simple/test-cluster-eaddrinuse.js b/test/parallel/test-cluster-eaddrinuse.js
index 73b1df0a54..73b1df0a54 100644
--- a/test/simple/test-cluster-eaddrinuse.js
+++ b/test/parallel/test-cluster-eaddrinuse.js
diff --git a/test/simple/test-cluster-fork-env.js b/test/parallel/test-cluster-fork-env.js
index a0b50aebdc..a0b50aebdc 100644
--- a/test/simple/test-cluster-fork-env.js
+++ b/test/parallel/test-cluster-fork-env.js
diff --git a/test/simple/test-cluster-http-pipe.js b/test/parallel/test-cluster-http-pipe.js
index 7123bf6275..7123bf6275 100644
--- a/test/simple/test-cluster-http-pipe.js
+++ b/test/parallel/test-cluster-http-pipe.js
diff --git a/test/simple/test-cluster-master-error.js b/test/parallel/test-cluster-master-error.js
index ee2ed9eb4e..ee2ed9eb4e 100644
--- a/test/simple/test-cluster-master-error.js
+++ b/test/parallel/test-cluster-master-error.js
diff --git a/test/simple/test-cluster-master-kill.js b/test/parallel/test-cluster-master-kill.js
index 3625403903..3625403903 100644
--- a/test/simple/test-cluster-master-kill.js
+++ b/test/parallel/test-cluster-master-kill.js
diff --git a/test/simple/test-cluster-message.js b/test/parallel/test-cluster-message.js
index 7407515ada..7407515ada 100644
--- a/test/simple/test-cluster-message.js
+++ b/test/parallel/test-cluster-message.js
diff --git a/test/simple/test-cluster-net-listen.js b/test/parallel/test-cluster-net-listen.js
index 927169c729..927169c729 100644
--- a/test/simple/test-cluster-net-listen.js
+++ b/test/parallel/test-cluster-net-listen.js
diff --git a/test/simple/test-cluster-net-send.js b/test/parallel/test-cluster-net-send.js
index 1313a624a7..1313a624a7 100644
--- a/test/simple/test-cluster-net-send.js
+++ b/test/parallel/test-cluster-net-send.js
diff --git a/test/simple/test-cluster-rr-domain-listen.js b/test/parallel/test-cluster-rr-domain-listen.js
index 574036df23..574036df23 100755
--- a/test/simple/test-cluster-rr-domain-listen.js
+++ b/test/parallel/test-cluster-rr-domain-listen.js
diff --git a/test/simple/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js
index 1b4a90dee0..1b4a90dee0 100644
--- a/test/simple/test-cluster-send-deadlock.js
+++ b/test/parallel/test-cluster-send-deadlock.js
diff --git a/test/simple/test-cluster-send-handle-twice.js b/test/parallel/test-cluster-send-handle-twice.js
index 3215eae79e..3215eae79e 100644
--- a/test/simple/test-cluster-send-handle-twice.js
+++ b/test/parallel/test-cluster-send-handle-twice.js
diff --git a/test/simple/test-cluster-setup-master-argv.js b/test/parallel/test-cluster-setup-master-argv.js
index d216943c8c..d216943c8c 100644
--- a/test/simple/test-cluster-setup-master-argv.js
+++ b/test/parallel/test-cluster-setup-master-argv.js
diff --git a/test/simple/test-cluster-setup-master-cumulative.js b/test/parallel/test-cluster-setup-master-cumulative.js
index 2f69cd3689..2f69cd3689 100644
--- a/test/simple/test-cluster-setup-master-cumulative.js
+++ b/test/parallel/test-cluster-setup-master-cumulative.js
diff --git a/test/simple/test-cluster-setup-master-emit.js b/test/parallel/test-cluster-setup-master-emit.js
index ee3af2ad41..ee3af2ad41 100644
--- a/test/simple/test-cluster-setup-master-emit.js
+++ b/test/parallel/test-cluster-setup-master-emit.js
diff --git a/test/simple/test-cluster-setup-master-multiple.js b/test/parallel/test-cluster-setup-master-multiple.js
index 21756b9c0c..21756b9c0c 100644
--- a/test/simple/test-cluster-setup-master-multiple.js
+++ b/test/parallel/test-cluster-setup-master-multiple.js
diff --git a/test/simple/test-cluster-setup-master.js b/test/parallel/test-cluster-setup-master.js
index d9f3879280..d9f3879280 100644
--- a/test/simple/test-cluster-setup-master.js
+++ b/test/parallel/test-cluster-setup-master.js
diff --git a/test/simple/test-cluster-shared-handle-bind-error.js b/test/parallel/test-cluster-shared-handle-bind-error.js
index ceccd9146d..ceccd9146d 100644
--- a/test/simple/test-cluster-shared-handle-bind-error.js
+++ b/test/parallel/test-cluster-shared-handle-bind-error.js
diff --git a/test/simple/test-cluster-shared-handle-bind-privileged-port.js b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js
index 67b3a88402..67b3a88402 100644
--- a/test/simple/test-cluster-shared-handle-bind-privileged-port.js
+++ b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js
diff --git a/test/simple/test-cluster-uncaught-exception.js b/test/parallel/test-cluster-uncaught-exception.js
index 48a8251270..48a8251270 100644
--- a/test/simple/test-cluster-uncaught-exception.js
+++ b/test/parallel/test-cluster-uncaught-exception.js
diff --git a/test/simple/test-cluster-worker-constructor.js b/test/parallel/test-cluster-worker-constructor.js
index ce7945cdb4..ce7945cdb4 100644
--- a/test/simple/test-cluster-worker-constructor.js
+++ b/test/parallel/test-cluster-worker-constructor.js
diff --git a/test/simple/test-cluster-worker-death.js b/test/parallel/test-cluster-worker-death.js
index ccd48552ab..ccd48552ab 100644
--- a/test/simple/test-cluster-worker-death.js
+++ b/test/parallel/test-cluster-worker-death.js
diff --git a/test/simple/test-cluster-worker-destroy.js b/test/parallel/test-cluster-worker-destroy.js
index 318b55caf6..318b55caf6 100644
--- a/test/simple/test-cluster-worker-destroy.js
+++ b/test/parallel/test-cluster-worker-destroy.js
diff --git a/test/simple/test-cluster-worker-disconnect.js b/test/parallel/test-cluster-worker-disconnect.js
index 632a25f2db..632a25f2db 100644
--- a/test/simple/test-cluster-worker-disconnect.js
+++ b/test/parallel/test-cluster-worker-disconnect.js
diff --git a/test/simple/test-cluster-worker-events.js b/test/parallel/test-cluster-worker-events.js
index 1276650d16..1276650d16 100644
--- a/test/simple/test-cluster-worker-events.js
+++ b/test/parallel/test-cluster-worker-events.js
diff --git a/test/simple/test-cluster-worker-exit.js b/test/parallel/test-cluster-worker-exit.js
index 7b9d5d86c4..7b9d5d86c4 100644
--- a/test/simple/test-cluster-worker-exit.js
+++ b/test/parallel/test-cluster-worker-exit.js
diff --git a/test/simple/test-cluster-worker-forced-exit.js b/test/parallel/test-cluster-worker-forced-exit.js
index 66d5f18355..66d5f18355 100644
--- a/test/simple/test-cluster-worker-forced-exit.js
+++ b/test/parallel/test-cluster-worker-forced-exit.js
diff --git a/test/simple/test-cluster-worker-init.js b/test/parallel/test-cluster-worker-init.js
index f750262e87..f750262e87 100644
--- a/test/simple/test-cluster-worker-init.js
+++ b/test/parallel/test-cluster-worker-init.js
diff --git a/test/simple/test-cluster-worker-isconnected.js b/test/parallel/test-cluster-worker-isconnected.js
index ed839d4963..ed839d4963 100644
--- a/test/simple/test-cluster-worker-isconnected.js
+++ b/test/parallel/test-cluster-worker-isconnected.js
diff --git a/test/simple/test-cluster-worker-isdead.js b/test/parallel/test-cluster-worker-isdead.js
index 11766c597f..11766c597f 100644
--- a/test/simple/test-cluster-worker-isdead.js
+++ b/test/parallel/test-cluster-worker-isdead.js
diff --git a/test/simple/test-cluster-worker-kill.js b/test/parallel/test-cluster-worker-kill.js
index 8c6068e8db..8c6068e8db 100644
--- a/test/simple/test-cluster-worker-kill.js
+++ b/test/parallel/test-cluster-worker-kill.js
diff --git a/test/simple/test-cluster-worker-no-exit.js b/test/parallel/test-cluster-worker-no-exit.js
index c521fcbb10..8634d5424b 100644
--- a/test/simple/test-cluster-worker-no-exit.js
+++ b/test/parallel/test-cluster-worker-no-exit.js
@@ -22,6 +22,7 @@
 var assert = require('assert');
 var cluster = require('cluster')
 var net = require('net');
+var common = require('../common');
 
 var destroyed;
 var success;
@@ -53,7 +54,7 @@ if (cluster.isMaster) {
       success = true;
     });
 
-  }).listen(0, function() {
+  }).listen(common.PORT, function() {
     var port = this.address().port;
 
     worker = cluster.fork()
diff --git a/test/simple/test-common.js b/test/parallel/test-common.js
index 420bd52a09..420bd52a09 100644
--- a/test/simple/test-common.js
+++ b/test/parallel/test-common.js
diff --git a/test/simple/test-console-instance.js b/test/parallel/test-console-instance.js
index e0166ebd31..e0166ebd31 100644
--- a/test/simple/test-console-instance.js
+++ b/test/parallel/test-console-instance.js
diff --git a/test/simple/test-console-not-call-toString.js b/test/parallel/test-console-not-call-toString.js
index a62004f70a..a62004f70a 100644
--- a/test/simple/test-console-not-call-toString.js
+++ b/test/parallel/test-console-not-call-toString.js
diff --git a/test/simple/test-console.js b/test/parallel/test-console.js
index 14ece8af5b..14ece8af5b 100644
--- a/test/simple/test-console.js
+++ b/test/parallel/test-console.js
diff --git a/test/simple/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js
index 8b44116073..8b44116073 100644
--- a/test/simple/test-crypto-authenticated.js
+++ b/test/parallel/test-crypto-authenticated.js
diff --git a/test/simple/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
index fe7da668e2..fe7da668e2 100644
--- a/test/simple/test-crypto-binary-default.js
+++ b/test/parallel/test-crypto-binary-default.js
diff --git a/test/simple/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js
index 60fedee745..60fedee745 100644
--- a/test/simple/test-crypto-certificate.js
+++ b/test/parallel/test-crypto-certificate.js
diff --git a/test/simple/test-crypto-dh-odd-key.js b/test/parallel/test-crypto-dh-odd-key.js
index a3d99e9b55..a3d99e9b55 100644
--- a/test/simple/test-crypto-dh-odd-key.js
+++ b/test/parallel/test-crypto-dh-odd-key.js
diff --git a/test/simple/test-crypto-domain.js b/test/parallel/test-crypto-domain.js
index 6284afc075..6284afc075 100644
--- a/test/simple/test-crypto-domain.js
+++ b/test/parallel/test-crypto-domain.js
diff --git a/test/simple/test-crypto-domains.js b/test/parallel/test-crypto-domains.js
index 1393f6da12..1393f6da12 100644
--- a/test/simple/test-crypto-domains.js
+++ b/test/parallel/test-crypto-domains.js
diff --git a/test/simple/test-crypto-ecb.js b/test/parallel/test-crypto-ecb.js
index e5b893cfcb..e5b893cfcb 100644
--- a/test/simple/test-crypto-ecb.js
+++ b/test/parallel/test-crypto-ecb.js
diff --git a/test/simple/test-crypto-from-binary.js b/test/parallel/test-crypto-from-binary.js
index 2033617006..2033617006 100644
--- a/test/simple/test-crypto-from-binary.js
+++ b/test/parallel/test-crypto-from-binary.js
diff --git a/test/simple/test-crypto-hash-stream-pipe.js b/test/parallel/test-crypto-hash-stream-pipe.js
index 1394903fab..1394903fab 100644
--- a/test/simple/test-crypto-hash-stream-pipe.js
+++ b/test/parallel/test-crypto-hash-stream-pipe.js
diff --git a/test/simple/test-crypto-padding-aes256.js b/test/parallel/test-crypto-padding-aes256.js
index dd293feb10..dd293feb10 100644
--- a/test/simple/test-crypto-padding-aes256.js
+++ b/test/parallel/test-crypto-padding-aes256.js
diff --git a/test/simple/test-crypto-padding.js b/test/parallel/test-crypto-padding.js
index 22edbf4814..22edbf4814 100644
--- a/test/simple/test-crypto-padding.js
+++ b/test/parallel/test-crypto-padding.js
diff --git a/test/simple/test-crypto-random.js b/test/parallel/test-crypto-random.js
index 24a76f4f1a..24a76f4f1a 100644
--- a/test/simple/test-crypto-random.js
+++ b/test/parallel/test-crypto-random.js
diff --git a/test/simple/test-crypto-stream.js b/test/parallel/test-crypto-stream.js
index ff58e8040b..ff58e8040b 100644
--- a/test/simple/test-crypto-stream.js
+++ b/test/parallel/test-crypto-stream.js
diff --git a/test/simple/test-crypto-verify-failure.js b/test/parallel/test-crypto-verify-failure.js
index 09c43ddc05..09c43ddc05 100644
--- a/test/simple/test-crypto-verify-failure.js
+++ b/test/parallel/test-crypto-verify-failure.js
diff --git a/test/simple/test-crypto.js b/test/parallel/test-crypto.js
index d3f1ade321..d3f1ade321 100644
--- a/test/simple/test-crypto.js
+++ b/test/parallel/test-crypto.js
diff --git a/test/simple/test-delayed-require.js b/test/parallel/test-delayed-require.js
index 31c324976f..31c324976f 100644
--- a/test/simple/test-delayed-require.js
+++ b/test/parallel/test-delayed-require.js
diff --git a/test/simple/test-dgram-address.js b/test/parallel/test-dgram-address.js
index 30d8eb0e16..30d8eb0e16 100644
--- a/test/simple/test-dgram-address.js
+++ b/test/parallel/test-dgram-address.js
diff --git a/test/simple/test-dgram-bind-default-address.js b/test/parallel/test-dgram-bind-default-address.js
index e7b65c57bf..e7b65c57bf 100644
--- a/test/simple/test-dgram-bind-default-address.js
+++ b/test/parallel/test-dgram-bind-default-address.js
diff --git a/test/simple/test-dgram-bind-shared-ports.js b/test/parallel/test-dgram-bind-shared-ports.js
index c9e22b5921..c9e22b5921 100644
--- a/test/simple/test-dgram-bind-shared-ports.js
+++ b/test/parallel/test-dgram-bind-shared-ports.js
diff --git a/test/simple/test-dgram-bind.js b/test/parallel/test-dgram-bind.js
index 8ee67637fc..8ee67637fc 100644
--- a/test/simple/test-dgram-bind.js
+++ b/test/parallel/test-dgram-bind.js
diff --git a/test/simple/test-dgram-broadcast-multi-process.js b/test/parallel/test-dgram-broadcast-multi-process.js
index 4d9eebc101..4d9eebc101 100644
--- a/test/simple/test-dgram-broadcast-multi-process.js
+++ b/test/parallel/test-dgram-broadcast-multi-process.js
diff --git a/test/simple/test-dgram-bytes-length.js b/test/parallel/test-dgram-bytes-length.js
index 4e90f78c80..4e90f78c80 100644
--- a/test/simple/test-dgram-bytes-length.js
+++ b/test/parallel/test-dgram-bytes-length.js
diff --git a/test/simple/test-dgram-close.js b/test/parallel/test-dgram-close.js
index 77af6f13b8..77af6f13b8 100644
--- a/test/simple/test-dgram-close.js
+++ b/test/parallel/test-dgram-close.js
diff --git a/test/simple/test-dgram-empty-packet.js b/test/parallel/test-dgram-empty-packet.js
index 812e88a3b7..812e88a3b7 100644
--- a/test/simple/test-dgram-empty-packet.js
+++ b/test/parallel/test-dgram-empty-packet.js
diff --git a/test/simple/test-dgram-implicit-bind.js b/test/parallel/test-dgram-implicit-bind.js
index 6039629c41..6039629c41 100644
--- a/test/simple/test-dgram-implicit-bind.js
+++ b/test/parallel/test-dgram-implicit-bind.js
diff --git a/test/simple/test-dgram-listen-after-bind.js b/test/parallel/test-dgram-listen-after-bind.js
index e5f1c4d653..e5f1c4d653 100644
--- a/test/simple/test-dgram-listen-after-bind.js
+++ b/test/parallel/test-dgram-listen-after-bind.js
diff --git a/test/simple/test-dgram-msgsize.js b/test/parallel/test-dgram-msgsize.js
index 03f9cb5324..03f9cb5324 100644
--- a/test/simple/test-dgram-msgsize.js
+++ b/test/parallel/test-dgram-msgsize.js
diff --git a/test/simple/test-dgram-multicast-setTTL.js b/test/parallel/test-dgram-multicast-setTTL.js
index 2ef0c167a8..2ef0c167a8 100644
--- a/test/simple/test-dgram-multicast-setTTL.js
+++ b/test/parallel/test-dgram-multicast-setTTL.js
diff --git a/test/simple/test-dgram-oob-buffer.js b/test/parallel/test-dgram-oob-buffer.js
index 061c8417cd..061c8417cd 100644
--- a/test/simple/test-dgram-oob-buffer.js
+++ b/test/parallel/test-dgram-oob-buffer.js
diff --git a/test/simple/test-dgram-pingpong.js b/test/parallel/test-dgram-pingpong.js
index 992153293b..992153293b 100644
--- a/test/simple/test-dgram-pingpong.js
+++ b/test/parallel/test-dgram-pingpong.js
diff --git a/test/simple/test-dgram-ref.js b/test/parallel/test-dgram-ref.js
index ebbbac2fc6..ebbbac2fc6 100644
--- a/test/simple/test-dgram-ref.js
+++ b/test/parallel/test-dgram-ref.js
diff --git a/test/simple/test-dgram-regress-4496.js b/test/parallel/test-dgram-regress-4496.js
index e45824a107..e45824a107 100644
--- a/test/simple/test-dgram-regress-4496.js
+++ b/test/parallel/test-dgram-regress-4496.js
diff --git a/test/simple/test-dgram-send-bad-arguments.js b/test/parallel/test-dgram-send-bad-arguments.js
index a9a12d4581..a9a12d4581 100644
--- a/test/simple/test-dgram-send-bad-arguments.js
+++ b/test/parallel/test-dgram-send-bad-arguments.js
diff --git a/test/simple/test-dgram-send-callback-buffer-length.js b/test/parallel/test-dgram-send-callback-buffer-length.js
index c3b7d5ccc9..c3b7d5ccc9 100644
--- a/test/simple/test-dgram-send-callback-buffer-length.js
+++ b/test/parallel/test-dgram-send-callback-buffer-length.js
diff --git a/test/simple/test-dgram-send-empty-buffer.js b/test/parallel/test-dgram-send-empty-buffer.js
index 4eb0ab4fc3..4eb0ab4fc3 100644
--- a/test/simple/test-dgram-send-empty-buffer.js
+++ b/test/parallel/test-dgram-send-empty-buffer.js
diff --git a/test/simple/test-dgram-udp4.js b/test/parallel/test-dgram-udp4.js
index 838c48f2bb..cc1f1c0880 100644
--- a/test/simple/test-dgram-udp4.js
+++ b/test/parallel/test-dgram-udp4.js
@@ -27,7 +27,7 @@ var assert = require('assert');
 
 var fs = require('fs'),
     dgram = require('dgram'), server, client,
-    server_port = 20989,
+    server_port = common.PORT,
     message_to_send = 'A message to send',
     timer;
 
diff --git a/test/simple/test-dgram-unref.js b/test/parallel/test-dgram-unref.js
index 38abbac274..38abbac274 100644
--- a/test/simple/test-dgram-unref.js
+++ b/test/parallel/test-dgram-unref.js
diff --git a/test/simple/test-dh-padding.js b/test/parallel/test-dh-padding.js
index 753c0eb819..753c0eb819 100644
--- a/test/simple/test-dh-padding.js
+++ b/test/parallel/test-dh-padding.js
diff --git a/test/simple/test-dns-cares-domains.js b/test/parallel/test-dns-cares-domains.js
index 8581ed64db..8581ed64db 100644
--- a/test/simple/test-dns-cares-domains.js
+++ b/test/parallel/test-dns-cares-domains.js
diff --git a/test/simple/test-dns-lookup-cb-error.js b/test/parallel/test-dns-lookup-cb-error.js
index 0365810984..0365810984 100644
--- a/test/simple/test-dns-lookup-cb-error.js
+++ b/test/parallel/test-dns-lookup-cb-error.js
diff --git a/test/simple/test-dns-regress-6244.js b/test/parallel/test-dns-regress-6244.js
index ca2957926e..ca2957926e 100644
--- a/test/simple/test-dns-regress-6244.js
+++ b/test/parallel/test-dns-regress-6244.js
diff --git a/test/simple/test-dns-regress-7070.js b/test/parallel/test-dns-regress-7070.js
index 9aca4f728d..9aca4f728d 100644
--- a/test/simple/test-dns-regress-7070.js
+++ b/test/parallel/test-dns-regress-7070.js
diff --git a/test/simple/test-dns.js b/test/parallel/test-dns.js
index 405bcf0a08..405bcf0a08 100644
--- a/test/simple/test-dns.js
+++ b/test/parallel/test-dns.js
diff --git a/test/simple/test-domain-crypto.js b/test/parallel/test-domain-crypto.js
index 66e9628804..66e9628804 100644
--- a/test/simple/test-domain-crypto.js
+++ b/test/parallel/test-domain-crypto.js
diff --git a/test/simple/test-domain-enter-exit.js b/test/parallel/test-domain-enter-exit.js
index 7d248ea15f..7d248ea15f 100644
--- a/test/simple/test-domain-enter-exit.js
+++ b/test/parallel/test-domain-enter-exit.js
diff --git a/test/simple/test-domain-exit-dispose-again.js b/test/parallel/test-domain-exit-dispose-again.js
index 22928f2604..22928f2604 100644
--- a/test/simple/test-domain-exit-dispose-again.js
+++ b/test/parallel/test-domain-exit-dispose-again.js
diff --git a/test/simple/test-domain-exit-dispose.js b/test/parallel/test-domain-exit-dispose.js
index fd990911c1..fd990911c1 100644
--- a/test/simple/test-domain-exit-dispose.js
+++ b/test/parallel/test-domain-exit-dispose.js
diff --git a/test/simple/test-domain-from-timer.js b/test/parallel/test-domain-from-timer.js
index 3e73a5c4b8..3e73a5c4b8 100644
--- a/test/simple/test-domain-from-timer.js
+++ b/test/parallel/test-domain-from-timer.js
diff --git a/test/simple/test-domain-http-server.js b/test/parallel/test-domain-http-server.js
index 57e8ac4d14..57e8ac4d14 100644
--- a/test/simple/test-domain-http-server.js
+++ b/test/parallel/test-domain-http-server.js
diff --git a/test/simple/test-domain-implicit-fs.js b/test/parallel/test-domain-implicit-fs.js
index c701c93158..c701c93158 100644
--- a/test/simple/test-domain-implicit-fs.js
+++ b/test/parallel/test-domain-implicit-fs.js
diff --git a/test/simple/test-domain-multi.js b/test/parallel/test-domain-multi.js
index 68e4b11a64..68e4b11a64 100644
--- a/test/simple/test-domain-multi.js
+++ b/test/parallel/test-domain-multi.js
diff --git a/test/simple/test-domain-nested-throw.js b/test/parallel/test-domain-nested-throw.js
index e119486675..e119486675 100644
--- a/test/simple/test-domain-nested-throw.js
+++ b/test/parallel/test-domain-nested-throw.js
diff --git a/test/simple/test-domain-nested.js b/test/parallel/test-domain-nested.js
index efd672b25f..efd672b25f 100644
--- a/test/simple/test-domain-nested.js
+++ b/test/parallel/test-domain-nested.js
diff --git a/test/simple/test-domain-safe-exit.js b/test/parallel/test-domain-safe-exit.js
index a7dcef078b..a7dcef078b 100644
--- a/test/simple/test-domain-safe-exit.js
+++ b/test/parallel/test-domain-safe-exit.js
diff --git a/test/simple/test-domain-stack.js b/test/parallel/test-domain-stack.js
index eecb85b4bb..eecb85b4bb 100644
--- a/test/simple/test-domain-stack.js
+++ b/test/parallel/test-domain-stack.js
diff --git a/test/simple/test-domain-timers.js b/test/parallel/test-domain-timers.js
index 388673c088..388673c088 100644
--- a/test/simple/test-domain-timers.js
+++ b/test/parallel/test-domain-timers.js
diff --git a/test/simple/test-domain.js b/test/parallel/test-domain.js
index 41eb602e42..41eb602e42 100644
--- a/test/simple/test-domain.js
+++ b/test/parallel/test-domain.js
diff --git a/test/simple/test-error-reporting.js b/test/parallel/test-error-reporting.js
index c187998dd6..c187998dd6 100644
--- a/test/simple/test-error-reporting.js
+++ b/test/parallel/test-error-reporting.js
diff --git a/test/simple/test-eval-require.js b/test/parallel/test-eval-require.js
index dfef416ce9..dfef416ce9 100644
--- a/test/simple/test-eval-require.js
+++ b/test/parallel/test-eval-require.js
diff --git a/test/simple/test-eval.js b/test/parallel/test-eval.js
index 9c656a8770..9c656a8770 100644
--- a/test/simple/test-eval.js
+++ b/test/parallel/test-eval.js
diff --git a/test/simple/test-event-emitter-add-listeners.js b/test/parallel/test-event-emitter-add-listeners.js
index 0806e049d4..0806e049d4 100644
--- a/test/simple/test-event-emitter-add-listeners.js
+++ b/test/parallel/test-event-emitter-add-listeners.js
diff --git a/test/simple/test-event-emitter-check-listener-leaks.js b/test/parallel/test-event-emitter-check-listener-leaks.js
index d073e5de13..d073e5de13 100644
--- a/test/simple/test-event-emitter-check-listener-leaks.js
+++ b/test/parallel/test-event-emitter-check-listener-leaks.js
diff --git a/test/simple/test-event-emitter-get-max-listeners.js b/test/parallel/test-event-emitter-get-max-listeners.js
index 8e47ef7a79..8e47ef7a79 100644
--- a/test/simple/test-event-emitter-get-max-listeners.js
+++ b/test/parallel/test-event-emitter-get-max-listeners.js
diff --git a/test/simple/test-event-emitter-listeners-side-effects.js b/test/parallel/test-event-emitter-listeners-side-effects.js
index c6218e0598..c6218e0598 100644
--- a/test/simple/test-event-emitter-listeners-side-effects.js
+++ b/test/parallel/test-event-emitter-listeners-side-effects.js
diff --git a/test/simple/test-event-emitter-listeners.js b/test/parallel/test-event-emitter-listeners.js
index 3e622835b8..3e622835b8 100644
--- a/test/simple/test-event-emitter-listeners.js
+++ b/test/parallel/test-event-emitter-listeners.js
diff --git a/test/simple/test-event-emitter-max-listeners.js b/test/parallel/test-event-emitter-max-listeners.js
index dfc3e1352d..dfc3e1352d 100644
--- a/test/simple/test-event-emitter-max-listeners.js
+++ b/test/parallel/test-event-emitter-max-listeners.js
diff --git a/test/simple/test-event-emitter-method-names.js b/test/parallel/test-event-emitter-method-names.js
index 60d16b3977..60d16b3977 100644
--- a/test/simple/test-event-emitter-method-names.js
+++ b/test/parallel/test-event-emitter-method-names.js
diff --git a/test/simple/test-event-emitter-modify-in-emit.js b/test/parallel/test-event-emitter-modify-in-emit.js
index 738af098cd..738af098cd 100644
--- a/test/simple/test-event-emitter-modify-in-emit.js
+++ b/test/parallel/test-event-emitter-modify-in-emit.js
diff --git a/test/simple/test-event-emitter-no-error-provided-to-error-event.js b/test/parallel/test-event-emitter-no-error-provided-to-error-event.js
index 79f14904e0..79f14904e0 100644
--- a/test/simple/test-event-emitter-no-error-provided-to-error-event.js
+++ b/test/parallel/test-event-emitter-no-error-provided-to-error-event.js
diff --git a/test/simple/test-event-emitter-num-args.js b/test/parallel/test-event-emitter-num-args.js
index 037c56965b..037c56965b 100644
--- a/test/simple/test-event-emitter-num-args.js
+++ b/test/parallel/test-event-emitter-num-args.js
diff --git a/test/simple/test-event-emitter-once.js b/test/parallel/test-event-emitter-once.js
index 2eaebcc7a5..2eaebcc7a5 100644
--- a/test/simple/test-event-emitter-once.js
+++ b/test/parallel/test-event-emitter-once.js
diff --git a/test/simple/test-event-emitter-remove-all-listeners.js b/test/parallel/test-event-emitter-remove-all-listeners.js
index f9848d6823..f9848d6823 100644
--- a/test/simple/test-event-emitter-remove-all-listeners.js
+++ b/test/parallel/test-event-emitter-remove-all-listeners.js
diff --git a/test/simple/test-event-emitter-remove-listeners.js b/test/parallel/test-event-emitter-remove-listeners.js
index 78133a4f34..78133a4f34 100644
--- a/test/simple/test-event-emitter-remove-listeners.js
+++ b/test/parallel/test-event-emitter-remove-listeners.js
diff --git a/test/simple/test-event-emitter-set-max-listeners-side-effects.js b/test/parallel/test-event-emitter-set-max-listeners-side-effects.js
index 604129796e..604129796e 100644
--- a/test/simple/test-event-emitter-set-max-listeners-side-effects.js
+++ b/test/parallel/test-event-emitter-set-max-listeners-side-effects.js
diff --git a/test/simple/test-event-emitter-subclass.js b/test/parallel/test-event-emitter-subclass.js
index 60b4bf387d..60b4bf387d 100644
--- a/test/simple/test-event-emitter-subclass.js
+++ b/test/parallel/test-event-emitter-subclass.js
diff --git a/test/simple/test-exception-handler.js b/test/parallel/test-exception-handler.js
index 38137b8340..38137b8340 100644
--- a/test/simple/test-exception-handler.js
+++ b/test/parallel/test-exception-handler.js
diff --git a/test/simple/test-exception-handler2.js b/test/parallel/test-exception-handler2.js
index 6b8afa909f..6b8afa909f 100644
--- a/test/simple/test-exception-handler2.js
+++ b/test/parallel/test-exception-handler2.js
diff --git a/test/simple/test-exec-max-buffer.js b/test/parallel/test-exec-max-buffer.js
index 3157fc73fa..3157fc73fa 100644
--- a/test/simple/test-exec-max-buffer.js
+++ b/test/parallel/test-exec-max-buffer.js
diff --git a/test/simple/test-file-read-noexist.js b/test/parallel/test-file-read-noexist.js
index aa5e761b4f..aa5e761b4f 100644
--- a/test/simple/test-file-read-noexist.js
+++ b/test/parallel/test-file-read-noexist.js
diff --git a/test/simple/test-file-write-stream.js b/test/parallel/test-file-write-stream.js
index d4d146a84a..d4d146a84a 100644
--- a/test/simple/test-file-write-stream.js
+++ b/test/parallel/test-file-write-stream.js
diff --git a/test/simple/test-file-write-stream2.js b/test/parallel/test-file-write-stream2.js
index 68361bb52b..68361bb52b 100644
--- a/test/simple/test-file-write-stream2.js
+++ b/test/parallel/test-file-write-stream2.js
diff --git a/test/simple/test-file-write-stream3.js b/test/parallel/test-file-write-stream3.js
index 013946217b..013946217b 100644
--- a/test/simple/test-file-write-stream3.js
+++ b/test/parallel/test-file-write-stream3.js
diff --git a/test/simple/test-fs-access.js b/test/parallel/test-fs-access.js
index 3aa4b849f9..3aa4b849f9 100644
--- a/test/simple/test-fs-access.js
+++ b/test/parallel/test-fs-access.js
diff --git a/test/simple/test-fs-append-file-sync.js b/test/parallel/test-fs-append-file-sync.js
index 7bc6a0199f..7bc6a0199f 100644
--- a/test/simple/test-fs-append-file-sync.js
+++ b/test/parallel/test-fs-append-file-sync.js
diff --git a/test/simple/test-fs-append-file.js b/test/parallel/test-fs-append-file.js
index 450c8d3b9e..450c8d3b9e 100644
--- a/test/simple/test-fs-append-file.js
+++ b/test/parallel/test-fs-append-file.js
diff --git a/test/simple/test-fs-chmod.js b/test/parallel/test-fs-chmod.js
index 12fd820f3a..12fd820f3a 100644
--- a/test/simple/test-fs-chmod.js
+++ b/test/parallel/test-fs-chmod.js
diff --git a/test/simple/test-fs-empty-readStream.js b/test/parallel/test-fs-empty-readStream.js
index d181c21982..d181c21982 100644
--- a/test/simple/test-fs-empty-readStream.js
+++ b/test/parallel/test-fs-empty-readStream.js
diff --git a/test/simple/test-fs-error-messages.js b/test/parallel/test-fs-error-messages.js
index 16b5dd92b3..16b5dd92b3 100644
--- a/test/simple/test-fs-error-messages.js
+++ b/test/parallel/test-fs-error-messages.js
diff --git a/test/simple/test-fs-exists.js b/test/parallel/test-fs-exists.js
index 3775730569..3775730569 100644
--- a/test/simple/test-fs-exists.js
+++ b/test/parallel/test-fs-exists.js
diff --git a/test/simple/test-fs-fsync.js b/test/parallel/test-fs-fsync.js
index e624ed7d65..e624ed7d65 100644
--- a/test/simple/test-fs-fsync.js
+++ b/test/parallel/test-fs-fsync.js
diff --git a/test/simple/test-fs-long-path.js b/test/parallel/test-fs-long-path.js
index 67f042976e..67f042976e 100644
--- a/test/simple/test-fs-long-path.js
+++ b/test/parallel/test-fs-long-path.js
diff --git a/test/simple/test-fs-mkdir.js b/test/parallel/test-fs-mkdir.js
index d99cd371b3..d99cd371b3 100644
--- a/test/simple/test-fs-mkdir.js
+++ b/test/parallel/test-fs-mkdir.js
diff --git a/test/simple/test-fs-non-number-arguments-throw.js b/test/parallel/test-fs-non-number-arguments-throw.js
index 7a1e7bdb52..7a1e7bdb52 100644
--- a/test/simple/test-fs-non-number-arguments-throw.js
+++ b/test/parallel/test-fs-non-number-arguments-throw.js
diff --git a/test/simple/test-fs-null-bytes.js b/test/parallel/test-fs-null-bytes.js
index 5dec223ba8..5dec223ba8 100644
--- a/test/simple/test-fs-null-bytes.js
+++ b/test/parallel/test-fs-null-bytes.js
diff --git a/test/simple/test-fs-open-flags.js b/test/parallel/test-fs-open-flags.js
index e1c6c3be99..e1c6c3be99 100644
--- a/test/simple/test-fs-open-flags.js
+++ b/test/parallel/test-fs-open-flags.js
diff --git a/test/simple/test-fs-open.js b/test/parallel/test-fs-open.js
index e334de9895..e334de9895 100644
--- a/test/simple/test-fs-open.js
+++ b/test/parallel/test-fs-open.js
diff --git a/test/simple/test-fs-read-buffer.js b/test/parallel/test-fs-read-buffer.js
index 96f700363a..96f700363a 100644
--- a/test/simple/test-fs-read-buffer.js
+++ b/test/parallel/test-fs-read-buffer.js
diff --git a/test/simple/test-fs-read-file-sync-hostname.js b/test/parallel/test-fs-read-file-sync-hostname.js
index 758e2aedd8..758e2aedd8 100644
--- a/test/simple/test-fs-read-file-sync-hostname.js
+++ b/test/parallel/test-fs-read-file-sync-hostname.js
diff --git a/test/simple/test-fs-read-file-sync.js b/test/parallel/test-fs-read-file-sync.js
index 518d32cc18..518d32cc18 100644
--- a/test/simple/test-fs-read-file-sync.js
+++ b/test/parallel/test-fs-read-file-sync.js
diff --git a/test/simple/test-fs-read-stream-err.js b/test/parallel/test-fs-read-stream-err.js
index 54aa21799e..54aa21799e 100644
--- a/test/simple/test-fs-read-stream-err.js
+++ b/test/parallel/test-fs-read-stream-err.js
diff --git a/test/simple/test-fs-read-stream-fd.js b/test/parallel/test-fs-read-stream-fd.js
index 835ed97271..835ed97271 100644
--- a/test/simple/test-fs-read-stream-fd.js
+++ b/test/parallel/test-fs-read-stream-fd.js
diff --git a/test/simple/test-fs-read-stream-resume.js b/test/parallel/test-fs-read-stream-resume.js
index c3ace49e9f..c3ace49e9f 100644
--- a/test/simple/test-fs-read-stream-resume.js
+++ b/test/parallel/test-fs-read-stream-resume.js
diff --git a/test/simple/test-fs-read-stream.js b/test/parallel/test-fs-read-stream.js
index 4d1eebb2c1..4d1eebb2c1 100644
--- a/test/simple/test-fs-read-stream.js
+++ b/test/parallel/test-fs-read-stream.js
diff --git a/test/simple/test-fs-read.js b/test/parallel/test-fs-read.js
index 4a90f9091e..4a90f9091e 100644
--- a/test/simple/test-fs-read.js
+++ b/test/parallel/test-fs-read.js
diff --git a/test/simple/test-fs-readfile-empty.js b/test/parallel/test-fs-readfile-empty.js
index 31b83567ee..31b83567ee 100644
--- a/test/simple/test-fs-readfile-empty.js
+++ b/test/parallel/test-fs-readfile-empty.js
diff --git a/test/simple/test-fs-readfile-error.js b/test/parallel/test-fs-readfile-error.js
index 72e1e2e7fb..72e1e2e7fb 100644
--- a/test/simple/test-fs-readfile-error.js
+++ b/test/parallel/test-fs-readfile-error.js
diff --git a/test/simple/test-fs-readfile-pipe.js b/test/parallel/test-fs-readfile-pipe.js
index 8ca165144f..8ca165144f 100644
--- a/test/simple/test-fs-readfile-pipe.js
+++ b/test/parallel/test-fs-readfile-pipe.js
diff --git a/test/simple/test-fs-readfile-unlink.js b/test/parallel/test-fs-readfile-unlink.js
index 0bb4a67f78..0bb4a67f78 100644
--- a/test/simple/test-fs-readfile-unlink.js
+++ b/test/parallel/test-fs-readfile-unlink.js
diff --git a/test/simple/test-fs-readfile-zero-byte-liar.js b/test/parallel/test-fs-readfile-zero-byte-liar.js
index 60f41226f1..60f41226f1 100644
--- a/test/simple/test-fs-readfile-zero-byte-liar.js
+++ b/test/parallel/test-fs-readfile-zero-byte-liar.js
diff --git a/test/simple/test-fs-realpath.js b/test/parallel/test-fs-realpath.js
index 0c820907d9..9b02ae7173 100644
--- a/test/simple/test-fs-realpath.js
+++ b/test/parallel/test-fs-realpath.js
@@ -103,7 +103,7 @@ function test_simple_relative_symlink(callback) {
   var entry = common.tmpDir + '/symlink',
       expected = common.tmpDir + '/cycles/root.js';
   [
-    [entry, '../tmp/cycles/root.js']
+    [entry, '../' + common.tmpDirName + '/cycles/root.js']
   ].forEach(function(t) {
     try {fs.unlinkSync(t[0]);}catch (e) {}
     console.log('fs.symlinkSync(%j, %j, %j)', t[1], t[0], 'file');
@@ -335,15 +335,16 @@ function test_deep_symlink_mix(callback) {
   fs.mkdirSync(tmp('node-test-realpath-d2'), 0700);
   try {
     [
-      [entry, '../tmp/node-test-realpath-d1/foo'],
-      [tmp('node-test-realpath-d1'), '../tmp/node-test-realpath-d2'],
+      [entry, '../' + common.tmpDirName + '/node-test-realpath-d1/foo'],
+      [tmp('node-test-realpath-d1'),
+          '../' + common.tmpDirName + '/node-test-realpath-d2'],
       [tmp('node-test-realpath-d2/foo'), '../node-test-realpath-f2'],
       [tmp('node-test-realpath-f2'), fixturesAbsDir +
            '/nested-index/one/realpath-c'],
       [fixturesAbsDir + '/nested-index/one/realpath-c', fixturesAbsDir +
             '/nested-index/two/realpath-c'],
       [fixturesAbsDir + '/nested-index/two/realpath-c',
-        '../../../tmp/cycles/root.js']
+        '../../../' + common.tmpDirName + '/cycles/root.js']
     ].forEach(function(t) {
       //common.debug('setting up '+t[0]+' -> '+t[1]);
       try { fs.unlinkSync(t[0]); } catch (e) {}
diff --git a/test/simple/test-fs-sir-writes-alot.js b/test/parallel/test-fs-sir-writes-alot.js
index e16f56bdc8..e16f56bdc8 100644
--- a/test/simple/test-fs-sir-writes-alot.js
+++ b/test/parallel/test-fs-sir-writes-alot.js
diff --git a/test/simple/test-fs-stat.js b/test/parallel/test-fs-stat.js
index 8c5a9c64c1..8c5a9c64c1 100644
--- a/test/simple/test-fs-stat.js
+++ b/test/parallel/test-fs-stat.js
diff --git a/test/simple/test-fs-stream-double-close.js b/test/parallel/test-fs-stream-double-close.js
index 89386b6e64..89386b6e64 100644
--- a/test/simple/test-fs-stream-double-close.js
+++ b/test/parallel/test-fs-stream-double-close.js
diff --git a/test/simple/test-fs-symlink-dir-junction-relative.js b/test/parallel/test-fs-symlink-dir-junction-relative.js
index c598d2e926..c598d2e926 100644
--- a/test/simple/test-fs-symlink-dir-junction-relative.js
+++ b/test/parallel/test-fs-symlink-dir-junction-relative.js
diff --git a/test/simple/test-fs-symlink-dir-junction.js b/test/parallel/test-fs-symlink-dir-junction.js
index c675b920e3..c675b920e3 100644
--- a/test/simple/test-fs-symlink-dir-junction.js
+++ b/test/parallel/test-fs-symlink-dir-junction.js
diff --git a/test/simple/test-fs-symlink.js b/test/parallel/test-fs-symlink.js
index 6b23b1e1c1..6b23b1e1c1 100644
--- a/test/simple/test-fs-symlink.js
+++ b/test/parallel/test-fs-symlink.js
diff --git a/test/simple/test-fs-sync-fd-leak.js b/test/parallel/test-fs-sync-fd-leak.js
index fe932c7dfa..fe932c7dfa 100644
--- a/test/simple/test-fs-sync-fd-leak.js
+++ b/test/parallel/test-fs-sync-fd-leak.js
diff --git a/test/simple/test-fs-truncate-GH-6233.js b/test/parallel/test-fs-truncate-GH-6233.js
index 472afdcab9..472afdcab9 100644
--- a/test/simple/test-fs-truncate-GH-6233.js
+++ b/test/parallel/test-fs-truncate-GH-6233.js
diff --git a/test/simple/test-fs-truncate.js b/test/parallel/test-fs-truncate.js
index 09476b2ad8..09476b2ad8 100644
--- a/test/simple/test-fs-truncate.js
+++ b/test/parallel/test-fs-truncate.js
diff --git a/test/simple/test-fs-utimes.js b/test/parallel/test-fs-utimes.js
index eae80238bc..eae80238bc 100644
--- a/test/simple/test-fs-utimes.js
+++ b/test/parallel/test-fs-utimes.js
diff --git a/test/simple/test-fs-write-buffer.js b/test/parallel/test-fs-write-buffer.js
index 46013bd87b..46013bd87b 100644
--- a/test/simple/test-fs-write-buffer.js
+++ b/test/parallel/test-fs-write-buffer.js
diff --git a/test/simple/test-fs-write-file-buffer.js b/test/parallel/test-fs-write-file-buffer.js
index dfe7cf5f30..dfe7cf5f30 100644
--- a/test/simple/test-fs-write-file-buffer.js
+++ b/test/parallel/test-fs-write-file-buffer.js
diff --git a/test/simple/test-fs-write-file-sync.js b/test/parallel/test-fs-write-file-sync.js
index 3e723425ac..3e723425ac 100644
--- a/test/simple/test-fs-write-file-sync.js
+++ b/test/parallel/test-fs-write-file-sync.js
diff --git a/test/simple/test-fs-write-file.js b/test/parallel/test-fs-write-file.js
index b70ea444cf..b70ea444cf 100644
--- a/test/simple/test-fs-write-file.js
+++ b/test/parallel/test-fs-write-file.js
diff --git a/test/simple/test-fs-write-stream-change-open.js b/test/parallel/test-fs-write-stream-change-open.js
index d025e8da35..d025e8da35 100644
--- a/test/simple/test-fs-write-stream-change-open.js
+++ b/test/parallel/test-fs-write-stream-change-open.js
diff --git a/test/simple/test-fs-write-stream-end.js b/test/parallel/test-fs-write-stream-end.js
index 7bbc5d68e0..7bbc5d68e0 100644
--- a/test/simple/test-fs-write-stream-end.js
+++ b/test/parallel/test-fs-write-stream-end.js
diff --git a/test/simple/test-fs-write-stream-err.js b/test/parallel/test-fs-write-stream-err.js
index 53ef4e34e8..53ef4e34e8 100644
--- a/test/simple/test-fs-write-stream-err.js
+++ b/test/parallel/test-fs-write-stream-err.js
diff --git a/test/simple/test-fs-write-stream.js b/test/parallel/test-fs-write-stream.js
index da75e26f8f..da75e26f8f 100644
--- a/test/simple/test-fs-write-stream.js
+++ b/test/parallel/test-fs-write-stream.js
diff --git a/test/simple/test-fs-write-sync.js b/test/parallel/test-fs-write-sync.js
index c3dbfe3ba6..c3dbfe3ba6 100644
--- a/test/simple/test-fs-write-sync.js
+++ b/test/parallel/test-fs-write-sync.js
diff --git a/test/simple/test-fs-write.js b/test/parallel/test-fs-write.js
index 3d7a357a9a..3d7a357a9a 100644
--- a/test/simple/test-fs-write.js
+++ b/test/parallel/test-fs-write.js
diff --git a/test/simple/test-global.js b/test/parallel/test-global.js
index 4cc9799ba5..4cc9799ba5 100644
--- a/test/simple/test-global.js
+++ b/test/parallel/test-global.js
diff --git a/test/simple/test-handle-wrap-close-abort.js b/test/parallel/test-handle-wrap-close-abort.js
index 287c38b23a..287c38b23a 100644
--- a/test/simple/test-handle-wrap-close-abort.js
+++ b/test/parallel/test-handle-wrap-close-abort.js
diff --git a/test/simple/test-http-1.0-keep-alive.js b/test/parallel/test-http-1.0-keep-alive.js
index 851409d28b..851409d28b 100644
--- a/test/simple/test-http-1.0-keep-alive.js
+++ b/test/parallel/test-http-1.0-keep-alive.js
diff --git a/test/simple/test-http-1.0.js b/test/parallel/test-http-1.0.js
index f5f3aef0a6..f5f3aef0a6 100644
--- a/test/simple/test-http-1.0.js
+++ b/test/parallel/test-http-1.0.js
diff --git a/test/simple/test-http-304.js b/test/parallel/test-http-304.js
index fcef21aee7..fcef21aee7 100644
--- a/test/simple/test-http-304.js
+++ b/test/parallel/test-http-304.js
diff --git a/test/simple/test-http-abort-before-end.js b/test/parallel/test-http-abort-before-end.js
index 11e424fbe1..11e424fbe1 100644
--- a/test/simple/test-http-abort-before-end.js
+++ b/test/parallel/test-http-abort-before-end.js
diff --git a/test/simple/test-http-abort-client.js b/test/parallel/test-http-abort-client.js
index f15238af16..f15238af16 100644
--- a/test/simple/test-http-abort-client.js
+++ b/test/parallel/test-http-abort-client.js
diff --git a/test/simple/test-http-abort-queued.js b/test/parallel/test-http-abort-queued.js
index d3ec5a14d5..6d83cd41ce 100644
--- a/test/simple/test-http-abort-queued.js
+++ b/test/parallel/test-http-abort-queued.js
@@ -20,6 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var assert = require('assert'),
+    common = require('../common'),
     http = require('http');
 
 var complete;
@@ -38,7 +39,7 @@ var server = http.createServer(function (req, res) {
 });
 
 
-server.listen(0, function () {
+server.listen(common.PORT, function () {
   console.log('listen', server.address().port);
 
   var agent = new http.Agent({maxSockets: 1});
diff --git a/test/simple/test-http-after-connect.js b/test/parallel/test-http-after-connect.js
index 08b2c14a60..08b2c14a60 100644
--- a/test/simple/test-http-after-connect.js
+++ b/test/parallel/test-http-after-connect.js
diff --git a/test/simple/test-http-agent-destroyed-socket.js b/test/parallel/test-http-agent-destroyed-socket.js
index be90bc6771..be90bc6771 100644
--- a/test/simple/test-http-agent-destroyed-socket.js
+++ b/test/parallel/test-http-agent-destroyed-socket.js
diff --git a/test/simple/test-http-agent-false.js b/test/parallel/test-http-agent-false.js
index d897ab603c..d897ab603c 100644
--- a/test/simple/test-http-agent-false.js
+++ b/test/parallel/test-http-agent-false.js
diff --git a/test/simple/test-http-agent-keepalive.js b/test/parallel/test-http-agent-keepalive.js
index f56027a721..f56027a721 100644
--- a/test/simple/test-http-agent-keepalive.js
+++ b/test/parallel/test-http-agent-keepalive.js
diff --git a/test/simple/test-http-agent-no-protocol.js b/test/parallel/test-http-agent-no-protocol.js
index fa224c5a7c..fa224c5a7c 100644
--- a/test/simple/test-http-agent-no-protocol.js
+++ b/test/parallel/test-http-agent-no-protocol.js
diff --git a/test/simple/test-http-agent-null.js b/test/parallel/test-http-agent-null.js
index 8ae71d5088..3f49cec0c0 100644
--- a/test/simple/test-http-agent-null.js
+++ b/test/parallel/test-http-agent-null.js
@@ -34,7 +34,7 @@ process.on('exit', function() {
 var server = http.createServer(function(req, res) {
   request++;
   res.end();
-}).listen(function() {
+}).listen(common.PORT, function() {
   var options = {
     agent: null,
     port: this.address().port
diff --git a/test/simple/test-http-agent.js b/test/parallel/test-http-agent.js
index fc66dc49f8..fc66dc49f8 100644
--- a/test/simple/test-http-agent.js
+++ b/test/parallel/test-http-agent.js
diff --git a/test/simple/test-http-allow-req-after-204-res.js b/test/parallel/test-http-allow-req-after-204-res.js
index 225ff299e9..225ff299e9 100644
--- a/test/simple/test-http-allow-req-after-204-res.js
+++ b/test/parallel/test-http-allow-req-after-204-res.js
diff --git a/test/simple/test-http-bind-twice.js b/test/parallel/test-http-bind-twice.js
index 59d69efaa2..59d69efaa2 100644
--- a/test/simple/test-http-bind-twice.js
+++ b/test/parallel/test-http-bind-twice.js
diff --git a/test/simple/test-http-blank-header.js b/test/parallel/test-http-blank-header.js
index bd9be86102..bd9be86102 100644
--- a/test/simple/test-http-blank-header.js
+++ b/test/parallel/test-http-blank-header.js
diff --git a/test/simple/test-http-buffer-sanity.js b/test/parallel/test-http-buffer-sanity.js
index 2e650d9b2f..2e650d9b2f 100644
--- a/test/simple/test-http-buffer-sanity.js
+++ b/test/parallel/test-http-buffer-sanity.js
diff --git a/test/simple/test-http-byteswritten.js b/test/parallel/test-http-byteswritten.js
index dedc2399c2..dedc2399c2 100644
--- a/test/simple/test-http-byteswritten.js
+++ b/test/parallel/test-http-byteswritten.js
diff --git a/test/simple/test-http-chunked-304.js b/test/parallel/test-http-chunked-304.js
index 24c5fa1510..24c5fa1510 100644
--- a/test/simple/test-http-chunked-304.js
+++ b/test/parallel/test-http-chunked-304.js
diff --git a/test/simple/test-http-chunked.js b/test/parallel/test-http-chunked.js
index c5def3de78..c5def3de78 100644
--- a/test/simple/test-http-chunked.js
+++ b/test/parallel/test-http-chunked.js
diff --git a/test/simple/test-http-client-abort.js b/test/parallel/test-http-client-abort.js
index ae0ee2769c..ae0ee2769c 100644
--- a/test/simple/test-http-client-abort.js
+++ b/test/parallel/test-http-client-abort.js
diff --git a/test/simple/test-http-client-abort2.js b/test/parallel/test-http-client-abort2.js
index 17efb7e086..17efb7e086 100644
--- a/test/simple/test-http-client-abort2.js
+++ b/test/parallel/test-http-client-abort2.js
diff --git a/test/simple/test-http-client-agent.js b/test/parallel/test-http-client-agent.js
index 49ff77fc9e..49ff77fc9e 100644
--- a/test/simple/test-http-client-agent.js
+++ b/test/parallel/test-http-client-agent.js
diff --git a/test/simple/test-http-client-default-headers-exist.js b/test/parallel/test-http-client-default-headers-exist.js
index 24470b95da..24470b95da 100644
--- a/test/simple/test-http-client-default-headers-exist.js
+++ b/test/parallel/test-http-client-default-headers-exist.js
diff --git a/test/simple/test-http-client-encoding.js b/test/parallel/test-http-client-encoding.js
index 104bf28e2e..104bf28e2e 100644
--- a/test/simple/test-http-client-encoding.js
+++ b/test/parallel/test-http-client-encoding.js
diff --git a/test/simple/test-http-client-get-url.js b/test/parallel/test-http-client-get-url.js
index 451f5eeaa9..451f5eeaa9 100644
--- a/test/simple/test-http-client-get-url.js
+++ b/test/parallel/test-http-client-get-url.js
diff --git a/test/simple/test-http-client-parse-error.js b/test/parallel/test-http-client-parse-error.js
index 9896ca2251..9896ca2251 100644
--- a/test/simple/test-http-client-parse-error.js
+++ b/test/parallel/test-http-client-parse-error.js
diff --git a/test/simple/test-http-client-pipe-end.js b/test/parallel/test-http-client-pipe-end.js
index 51edebbe1a..51edebbe1a 100644
--- a/test/simple/test-http-client-pipe-end.js
+++ b/test/parallel/test-http-client-pipe-end.js
diff --git a/test/simple/test-http-client-race-2.js b/test/parallel/test-http-client-race-2.js
index 6b7c508c3d..6b7c508c3d 100644
--- a/test/simple/test-http-client-race-2.js
+++ b/test/parallel/test-http-client-race-2.js
diff --git a/test/simple/test-http-client-race.js b/test/parallel/test-http-client-race.js
index 0f50c8e841..0f50c8e841 100644
--- a/test/simple/test-http-client-race.js
+++ b/test/parallel/test-http-client-race.js
diff --git a/test/simple/test-http-client-readable.js b/test/parallel/test-http-client-readable.js
index 2b5f67562d..2b5f67562d 100644
--- a/test/simple/test-http-client-readable.js
+++ b/test/parallel/test-http-client-readable.js
diff --git a/test/simple/test-http-client-response-domain.js b/test/parallel/test-http-client-response-domain.js
index e5a39913f4..e5a39913f4 100644
--- a/test/simple/test-http-client-response-domain.js
+++ b/test/parallel/test-http-client-response-domain.js
diff --git a/test/simple/test-http-client-timeout-agent.js b/test/parallel/test-http-client-timeout-agent.js
index 79d0a24242..79d0a24242 100644
--- a/test/simple/test-http-client-timeout-agent.js
+++ b/test/parallel/test-http-client-timeout-agent.js
diff --git a/test/simple/test-http-client-timeout-event.js b/test/parallel/test-http-client-timeout-event.js
index e3e37f6993..e3e37f6993 100644
--- a/test/simple/test-http-client-timeout-event.js
+++ b/test/parallel/test-http-client-timeout-event.js
diff --git a/test/simple/test-http-client-timeout-with-data.js b/test/parallel/test-http-client-timeout-with-data.js
index 4e1aae6ff8..4e1aae6ff8 100644
--- a/test/simple/test-http-client-timeout-with-data.js
+++ b/test/parallel/test-http-client-timeout-with-data.js
diff --git a/test/simple/test-http-client-timeout.js b/test/parallel/test-http-client-timeout.js
index 98eb5539eb..98eb5539eb 100644
--- a/test/simple/test-http-client-timeout.js
+++ b/test/parallel/test-http-client-timeout.js
diff --git a/test/simple/test-http-client-unescaped-path.js b/test/parallel/test-http-client-unescaped-path.js
index 376bca19c4..376bca19c4 100644
--- a/test/simple/test-http-client-unescaped-path.js
+++ b/test/parallel/test-http-client-unescaped-path.js
diff --git a/test/simple/test-http-client-upload-buf.js b/test/parallel/test-http-client-upload-buf.js
index d607ea88bb..d607ea88bb 100644
--- a/test/simple/test-http-client-upload-buf.js
+++ b/test/parallel/test-http-client-upload-buf.js
diff --git a/test/simple/test-http-client-upload.js b/test/parallel/test-http-client-upload.js
index 912ca96084..912ca96084 100644
--- a/test/simple/test-http-client-upload.js
+++ b/test/parallel/test-http-client-upload.js
diff --git a/test/simple/test-http-conn-reset.js b/test/parallel/test-http-conn-reset.js
index 9c293721cf..9c293721cf 100644
--- a/test/simple/test-http-conn-reset.js
+++ b/test/parallel/test-http-conn-reset.js
diff --git a/test/simple/test-http-connect.js b/test/parallel/test-http-connect.js
index 3643cec18e..3643cec18e 100644
--- a/test/simple/test-http-connect.js
+++ b/test/parallel/test-http-connect.js
diff --git a/test/simple/test-http-contentLength0.js b/test/parallel/test-http-contentLength0.js
index c7f7b6b669..c7f7b6b669 100644
--- a/test/simple/test-http-contentLength0.js
+++ b/test/parallel/test-http-contentLength0.js
diff --git a/test/simple/test-http-createConnection.js b/test/parallel/test-http-createConnection.js
index bc29d9aee4..bc29d9aee4 100644
--- a/test/simple/test-http-createConnection.js
+++ b/test/parallel/test-http-createConnection.js
diff --git a/test/simple/test-http-curl-chunk-problem.js b/test/parallel/test-http-curl-chunk-problem.js
index 7016246335..7016246335 100644
--- a/test/simple/test-http-curl-chunk-problem.js
+++ b/test/parallel/test-http-curl-chunk-problem.js
diff --git a/test/simple/test-http-date-header.js b/test/parallel/test-http-date-header.js
index b11507c017..b11507c017 100644
--- a/test/simple/test-http-date-header.js
+++ b/test/parallel/test-http-date-header.js
diff --git a/test/simple/test-http-default-encoding.js b/test/parallel/test-http-default-encoding.js
index b06f7c83a2..b06f7c83a2 100644
--- a/test/simple/test-http-default-encoding.js
+++ b/test/parallel/test-http-default-encoding.js
diff --git a/test/simple/test-http-default-port.js b/test/parallel/test-http-default-port.js
index ec79de2aeb..ec79de2aeb 100644
--- a/test/simple/test-http-default-port.js
+++ b/test/parallel/test-http-default-port.js
diff --git a/test/simple/test-http-destroyed-socket-write2.js b/test/parallel/test-http-destroyed-socket-write2.js
index 3347f3ccc9..3347f3ccc9 100644
--- a/test/simple/test-http-destroyed-socket-write2.js
+++ b/test/parallel/test-http-destroyed-socket-write2.js
diff --git a/test/simple/test-http-dns-error.js b/test/parallel/test-http-dns-error.js
index fc6d6b89e1..fc6d6b89e1 100644
--- a/test/simple/test-http-dns-error.js
+++ b/test/parallel/test-http-dns-error.js
diff --git a/test/simple/test-http-end-throw-socket-handling.js b/test/parallel/test-http-end-throw-socket-handling.js
index 50aa97ff18..50aa97ff18 100644
--- a/test/simple/test-http-end-throw-socket-handling.js
+++ b/test/parallel/test-http-end-throw-socket-handling.js
diff --git a/test/simple/test-http-eof-on-connect.js b/test/parallel/test-http-eof-on-connect.js
index 95d6fdc950..95d6fdc950 100644
--- a/test/simple/test-http-eof-on-connect.js
+++ b/test/parallel/test-http-eof-on-connect.js
diff --git a/test/simple/test-http-exceptions.js b/test/parallel/test-http-exceptions.js
index 1501d944ae..1501d944ae 100644
--- a/test/simple/test-http-exceptions.js
+++ b/test/parallel/test-http-exceptions.js
diff --git a/test/simple/test-http-exit-delay.js b/test/parallel/test-http-exit-delay.js
index 900f4fabd5..900f4fabd5 100644
--- a/test/simple/test-http-exit-delay.js
+++ b/test/parallel/test-http-exit-delay.js
diff --git a/test/simple/test-http-expect-continue.js b/test/parallel/test-http-expect-continue.js
index 54c04cce0e..54c04cce0e 100644
--- a/test/simple/test-http-expect-continue.js
+++ b/test/parallel/test-http-expect-continue.js
diff --git a/test/simple/test-http-extra-response.js b/test/parallel/test-http-extra-response.js
index 1649a6a929..1649a6a929 100644
--- a/test/simple/test-http-extra-response.js
+++ b/test/parallel/test-http-extra-response.js
diff --git a/test/simple/test-http-flush.js b/test/parallel/test-http-flush.js
index 842cf8729e..842cf8729e 100644
--- a/test/simple/test-http-flush.js
+++ b/test/parallel/test-http-flush.js
diff --git a/test/simple/test-http-full-response.js b/test/parallel/test-http-full-response.js
index d33df8b883..d33df8b883 100644
--- a/test/simple/test-http-full-response.js
+++ b/test/parallel/test-http-full-response.js
diff --git a/test/simple/test-http-get-pipeline-problem.js b/test/parallel/test-http-get-pipeline-problem.js
index 720ce4b89c..720ce4b89c 100644
--- a/test/simple/test-http-get-pipeline-problem.js
+++ b/test/parallel/test-http-get-pipeline-problem.js
diff --git a/test/simple/test-http-head-request.js b/test/parallel/test-http-head-request.js
index ca0f13a1a2..ca0f13a1a2 100644
--- a/test/simple/test-http-head-request.js
+++ b/test/parallel/test-http-head-request.js
diff --git a/test/simple/test-http-head-response-has-no-body-end.js b/test/parallel/test-http-head-response-has-no-body-end.js
index cde777a58d..cde777a58d 100644
--- a/test/simple/test-http-head-response-has-no-body-end.js
+++ b/test/parallel/test-http-head-response-has-no-body-end.js
diff --git a/test/simple/test-http-head-response-has-no-body.js b/test/parallel/test-http-head-response-has-no-body.js
index ab6bd5b51f..ab6bd5b51f 100644
--- a/test/simple/test-http-head-response-has-no-body.js
+++ b/test/parallel/test-http-head-response-has-no-body.js
diff --git a/test/simple/test-http-header-read.js b/test/parallel/test-http-header-read.js
index 3383775922..3383775922 100644
--- a/test/simple/test-http-header-read.js
+++ b/test/parallel/test-http-header-read.js
diff --git a/test/simple/test-http-header-response-splitting.js b/test/parallel/test-http-header-response-splitting.js
index 1d3a85ce8b..1d3a85ce8b 100644
--- a/test/simple/test-http-header-response-splitting.js
+++ b/test/parallel/test-http-header-response-splitting.js
diff --git a/test/simple/test-http-hex-write.js b/test/parallel/test-http-hex-write.js
index 21a93df53e..21a93df53e 100644
--- a/test/simple/test-http-hex-write.js
+++ b/test/parallel/test-http-hex-write.js
diff --git a/test/simple/test-http-host-headers.js b/test/parallel/test-http-host-headers.js
index ca7f70947f..ca7f70947f 100644
--- a/test/simple/test-http-host-headers.js
+++ b/test/parallel/test-http-host-headers.js
diff --git a/test/simple/test-http-incoming-pipelined-socket-destroy.js b/test/parallel/test-http-incoming-pipelined-socket-destroy.js
index 3a2f531a75..3a2f531a75 100644
--- a/test/simple/test-http-incoming-pipelined-socket-destroy.js
+++ b/test/parallel/test-http-incoming-pipelined-socket-destroy.js
diff --git a/test/simple/test-http-keep-alive-close-on-header.js b/test/parallel/test-http-keep-alive-close-on-header.js
index 4318bd9706..4318bd9706 100644
--- a/test/simple/test-http-keep-alive-close-on-header.js
+++ b/test/parallel/test-http-keep-alive-close-on-header.js
diff --git a/test/simple/test-http-keep-alive.js b/test/parallel/test-http-keep-alive.js
index 75049c9c6f..75049c9c6f 100644
--- a/test/simple/test-http-keep-alive.js
+++ b/test/parallel/test-http-keep-alive.js
diff --git a/test/simple/test-http-keepalive-client.js b/test/parallel/test-http-keepalive-client.js
index 177a8ed7a9..177a8ed7a9 100644
--- a/test/simple/test-http-keepalive-client.js
+++ b/test/parallel/test-http-keepalive-client.js
diff --git a/test/simple/test-http-keepalive-maxsockets.js b/test/parallel/test-http-keepalive-maxsockets.js
index 8481eec357..8481eec357 100644
--- a/test/simple/test-http-keepalive-maxsockets.js
+++ b/test/parallel/test-http-keepalive-maxsockets.js
diff --git a/test/simple/test-http-keepalive-request.js b/test/parallel/test-http-keepalive-request.js
index 3b87375408..3b87375408 100644
--- a/test/simple/test-http-keepalive-request.js
+++ b/test/parallel/test-http-keepalive-request.js
diff --git a/test/simple/test-http-legacy.js b/test/parallel/test-http-legacy.js
index c6605b0e4e..c6605b0e4e 100644
--- a/test/simple/test-http-legacy.js
+++ b/test/parallel/test-http-legacy.js
diff --git a/test/simple/test-http-localaddress-bind-error.js b/test/parallel/test-http-localaddress-bind-error.js
index 719525cc61..719525cc61 100644
--- a/test/simple/test-http-localaddress-bind-error.js
+++ b/test/parallel/test-http-localaddress-bind-error.js
diff --git a/test/simple/test-http-localaddress.js b/test/parallel/test-http-localaddress.js
index d5778e09b0..d5778e09b0 100644
--- a/test/simple/test-http-localaddress.js
+++ b/test/parallel/test-http-localaddress.js
diff --git a/test/simple/test-http-malformed-request.js b/test/parallel/test-http-malformed-request.js
index 52165a21d6..52165a21d6 100644
--- a/test/simple/test-http-malformed-request.js
+++ b/test/parallel/test-http-malformed-request.js
diff --git a/test/simple/test-http-many-ended-pipelines.js b/test/parallel/test-http-many-ended-pipelines.js
index dffde722f2..dffde722f2 100644
--- a/test/simple/test-http-many-ended-pipelines.js
+++ b/test/parallel/test-http-many-ended-pipelines.js
diff --git a/test/simple/test-http-max-headers-count.js b/test/parallel/test-http-max-headers-count.js
index 4595b11e7c..4595b11e7c 100644
--- a/test/simple/test-http-max-headers-count.js
+++ b/test/parallel/test-http-max-headers-count.js
diff --git a/test/simple/test-http-methods.js b/test/parallel/test-http-methods.js
index eec66d2804..eec66d2804 100644
--- a/test/simple/test-http-methods.js
+++ b/test/parallel/test-http-methods.js
diff --git a/test/simple/test-http-multi-line-headers.js b/test/parallel/test-http-multi-line-headers.js
index 9415abadcb..9415abadcb 100644
--- a/test/simple/test-http-multi-line-headers.js
+++ b/test/parallel/test-http-multi-line-headers.js
diff --git a/test/simple/test-http-mutable-headers.js b/test/parallel/test-http-mutable-headers.js
index 6106ac6ee0..6106ac6ee0 100644
--- a/test/simple/test-http-mutable-headers.js
+++ b/test/parallel/test-http-mutable-headers.js
diff --git a/test/simple/test-http-no-content-length.js b/test/parallel/test-http-no-content-length.js
index 8c565aedc7..8c565aedc7 100644
--- a/test/simple/test-http-no-content-length.js
+++ b/test/parallel/test-http-no-content-length.js
diff --git a/test/simple/test-http-outgoing-finish.js b/test/parallel/test-http-outgoing-finish.js
index 668040a812..668040a812 100644
--- a/test/simple/test-http-outgoing-finish.js
+++ b/test/parallel/test-http-outgoing-finish.js
diff --git a/test/simple/test-http-parser-bad-ref.js b/test/parallel/test-http-parser-bad-ref.js
index 0e2a77bb3a..0e2a77bb3a 100644
--- a/test/simple/test-http-parser-bad-ref.js
+++ b/test/parallel/test-http-parser-bad-ref.js
diff --git a/test/simple/test-http-parser-free.js b/test/parallel/test-http-parser-free.js
index 7b35781f4d..7b35781f4d 100644
--- a/test/simple/test-http-parser-free.js
+++ b/test/parallel/test-http-parser-free.js
diff --git a/test/simple/test-http-parser.js b/test/parallel/test-http-parser.js
index c61dc99116..c61dc99116 100644
--- a/test/simple/test-http-parser.js
+++ b/test/parallel/test-http-parser.js
diff --git a/test/simple/test-http-pause-resume-one-end.js b/test/parallel/test-http-pause-resume-one-end.js
index f397452e98..f397452e98 100644
--- a/test/simple/test-http-pause-resume-one-end.js
+++ b/test/parallel/test-http-pause-resume-one-end.js
diff --git a/test/simple/test-http-pause.js b/test/parallel/test-http-pause.js
index 0edf6d6221..0edf6d6221 100644
--- a/test/simple/test-http-pause.js
+++ b/test/parallel/test-http-pause.js
diff --git a/test/simple/test-http-pipe-fs.js b/test/parallel/test-http-pipe-fs.js
index 57ebb11dca..57ebb11dca 100644
--- a/test/simple/test-http-pipe-fs.js
+++ b/test/parallel/test-http-pipe-fs.js
diff --git a/test/simple/test-http-proxy.js b/test/parallel/test-http-proxy.js
index b531f1a8ab..b531f1a8ab 100644
--- a/test/simple/test-http-proxy.js
+++ b/test/parallel/test-http-proxy.js
diff --git a/test/simple/test-http-raw-headers.js b/test/parallel/test-http-raw-headers.js
index 0d31d8f613..0d31d8f613 100644
--- a/test/simple/test-http-raw-headers.js
+++ b/test/parallel/test-http-raw-headers.js
diff --git a/test/simple/test-http-remove-header-stays-removed.js b/test/parallel/test-http-remove-header-stays-removed.js
index a15c7750c5..a15c7750c5 100644
--- a/test/simple/test-http-remove-header-stays-removed.js
+++ b/test/parallel/test-http-remove-header-stays-removed.js
diff --git a/test/simple/test-http-request-end-twice.js b/test/parallel/test-http-request-end-twice.js
index aa58772226..aa58772226 100644
--- a/test/simple/test-http-request-end-twice.js
+++ b/test/parallel/test-http-request-end-twice.js
diff --git a/test/simple/test-http-request-end.js b/test/parallel/test-http-request-end.js
index f64dcc305a..f64dcc305a 100644
--- a/test/simple/test-http-request-end.js
+++ b/test/parallel/test-http-request-end.js
diff --git a/test/simple/test-http-request-methods.js b/test/parallel/test-http-request-methods.js
index 33575aed7e..33575aed7e 100644
--- a/test/simple/test-http-request-methods.js
+++ b/test/parallel/test-http-request-methods.js
diff --git a/test/simple/test-http-res-write-after-end.js b/test/parallel/test-http-res-write-after-end.js
index 71a2564bfe..71a2564bfe 100644
--- a/test/simple/test-http-res-write-after-end.js
+++ b/test/parallel/test-http-res-write-after-end.js
diff --git a/test/simple/test-http-res-write-end-dont-take-array.js b/test/parallel/test-http-res-write-end-dont-take-array.js
index d60b75552d..d60b75552d 100644
--- a/test/simple/test-http-res-write-end-dont-take-array.js
+++ b/test/parallel/test-http-res-write-end-dont-take-array.js
diff --git a/test/simple/test-http-response-close.js b/test/parallel/test-http-response-close.js
index be89682a68..be89682a68 100644
--- a/test/simple/test-http-response-close.js
+++ b/test/parallel/test-http-response-close.js
diff --git a/test/simple/test-http-response-no-headers.js b/test/parallel/test-http-response-no-headers.js
index d16d8a4ce9..d16d8a4ce9 100644
--- a/test/simple/test-http-response-no-headers.js
+++ b/test/parallel/test-http-response-no-headers.js
diff --git a/test/simple/test-http-response-readable.js b/test/parallel/test-http-response-readable.js
index b48c06fb40..b48c06fb40 100644
--- a/test/simple/test-http-response-readable.js
+++ b/test/parallel/test-http-response-readable.js
diff --git a/test/simple/test-http-response-status-message.js b/test/parallel/test-http-response-status-message.js
index 3b3911010d..3b3911010d 100644
--- a/test/simple/test-http-response-status-message.js
+++ b/test/parallel/test-http-response-status-message.js
diff --git a/test/simple/test-http-server-multiheaders.js b/test/parallel/test-http-server-multiheaders.js
index b287169bda..b287169bda 100644
--- a/test/simple/test-http-server-multiheaders.js
+++ b/test/parallel/test-http-server-multiheaders.js
diff --git a/test/simple/test-http-server-multiheaders2.js b/test/parallel/test-http-server-multiheaders2.js
index 40674c0fc2..40674c0fc2 100644
--- a/test/simple/test-http-server-multiheaders2.js
+++ b/test/parallel/test-http-server-multiheaders2.js
diff --git a/test/simple/test-http-server-stale-close.js b/test/parallel/test-http-server-stale-close.js
index aa42a049bb..aa42a049bb 100644
--- a/test/simple/test-http-server-stale-close.js
+++ b/test/parallel/test-http-server-stale-close.js
diff --git a/test/simple/test-http-server.js b/test/parallel/test-http-server.js
index 7d97382d3e..7d97382d3e 100644
--- a/test/simple/test-http-server.js
+++ b/test/parallel/test-http-server.js
diff --git a/test/simple/test-http-set-cookies.js b/test/parallel/test-http-set-cookies.js
index bff34d8298..bff34d8298 100644
--- a/test/simple/test-http-set-cookies.js
+++ b/test/parallel/test-http-set-cookies.js
diff --git a/test/simple/test-http-set-timeout-server.js b/test/parallel/test-http-set-timeout-server.js
index ff4144963a..ff4144963a 100644
--- a/test/simple/test-http-set-timeout-server.js
+++ b/test/parallel/test-http-set-timeout-server.js
diff --git a/test/simple/test-http-set-timeout.js b/test/parallel/test-http-set-timeout.js
index 01d182b34c..01d182b34c 100644
--- a/test/simple/test-http-set-timeout.js
+++ b/test/parallel/test-http-set-timeout.js
diff --git a/test/simple/test-http-set-trailers.js b/test/parallel/test-http-set-trailers.js
index 445a3eeaac..445a3eeaac 100644
--- a/test/simple/test-http-set-trailers.js
+++ b/test/parallel/test-http-set-trailers.js
diff --git a/test/simple/test-http-should-keep-alive.js b/test/parallel/test-http-should-keep-alive.js
index 943c34bb43..943c34bb43 100644
--- a/test/simple/test-http-should-keep-alive.js
+++ b/test/parallel/test-http-should-keep-alive.js
diff --git a/test/simple/test-http-status-code.js b/test/parallel/test-http-status-code.js
index ca56230d26..ca56230d26 100644
--- a/test/simple/test-http-status-code.js
+++ b/test/parallel/test-http-status-code.js
diff --git a/test/simple/test-http-status-message.js b/test/parallel/test-http-status-message.js
index a8d7a35104..a8d7a35104 100644
--- a/test/simple/test-http-status-message.js
+++ b/test/parallel/test-http-status-message.js
diff --git a/test/simple/test-http-timeout-overflow.js b/test/parallel/test-http-timeout-overflow.js
index 3e62612b38..3e62612b38 100644
--- a/test/simple/test-http-timeout-overflow.js
+++ b/test/parallel/test-http-timeout-overflow.js
diff --git a/test/simple/test-http-timeout.js b/test/parallel/test-http-timeout.js
index ddd01c8a8f..ddd01c8a8f 100644
--- a/test/simple/test-http-timeout.js
+++ b/test/parallel/test-http-timeout.js
diff --git a/test/simple/test-http-unix-socket.js b/test/parallel/test-http-unix-socket.js
index 66d5403f67..66d5403f67 100644
--- a/test/simple/test-http-unix-socket.js
+++ b/test/parallel/test-http-unix-socket.js
diff --git a/test/simple/test-http-upgrade-agent.js b/test/parallel/test-http-upgrade-agent.js
index 1077a983dc..1077a983dc 100644
--- a/test/simple/test-http-upgrade-agent.js
+++ b/test/parallel/test-http-upgrade-agent.js
diff --git a/test/simple/test-http-upgrade-client.js b/test/parallel/test-http-upgrade-client.js
index 3bf5beccf5..3bf5beccf5 100644
--- a/test/simple/test-http-upgrade-client.js
+++ b/test/parallel/test-http-upgrade-client.js
diff --git a/test/simple/test-http-upgrade-client2.js b/test/parallel/test-http-upgrade-client2.js
index fa39f2a572..fa39f2a572 100644
--- a/test/simple/test-http-upgrade-client2.js
+++ b/test/parallel/test-http-upgrade-client2.js
diff --git a/test/simple/test-http-upgrade-server.js b/test/parallel/test-http-upgrade-server.js
index b514eff3c9..b514eff3c9 100644
--- a/test/simple/test-http-upgrade-server.js
+++ b/test/parallel/test-http-upgrade-server.js
diff --git a/test/simple/test-http-upgrade-server2.js b/test/parallel/test-http-upgrade-server2.js
index e617d3b1c5..e617d3b1c5 100644
--- a/test/simple/test-http-upgrade-server2.js
+++ b/test/parallel/test-http-upgrade-server2.js
diff --git a/test/simple/test-http-url.parse-auth-with-header-in-request.js b/test/parallel/test-http-url.parse-auth-with-header-in-request.js
index 5ac789068e..5ac789068e 100644
--- a/test/simple/test-http-url.parse-auth-with-header-in-request.js
+++ b/test/parallel/test-http-url.parse-auth-with-header-in-request.js
diff --git a/test/simple/test-http-url.parse-auth.js b/test/parallel/test-http-url.parse-auth.js
index 4c07d5ffcc..4c07d5ffcc 100644
--- a/test/simple/test-http-url.parse-auth.js
+++ b/test/parallel/test-http-url.parse-auth.js
diff --git a/test/simple/test-http-url.parse-basic.js b/test/parallel/test-http-url.parse-basic.js
index 8bf12b1c2d..8bf12b1c2d 100644
--- a/test/simple/test-http-url.parse-basic.js
+++ b/test/parallel/test-http-url.parse-basic.js
diff --git a/test/simple/test-http-url.parse-https.request.js b/test/parallel/test-http-url.parse-https.request.js
index b83f0df9fc..b83f0df9fc 100644
--- a/test/simple/test-http-url.parse-https.request.js
+++ b/test/parallel/test-http-url.parse-https.request.js
diff --git a/test/simple/test-http-url.parse-only-support-http-https-protocol.js b/test/parallel/test-http-url.parse-only-support-http-https-protocol.js
index 0f57126419..0f57126419 100644
--- a/test/simple/test-http-url.parse-only-support-http-https-protocol.js
+++ b/test/parallel/test-http-url.parse-only-support-http-https-protocol.js
diff --git a/test/simple/test-http-url.parse-path.js b/test/parallel/test-http-url.parse-path.js
index 8ef09520c6..8ef09520c6 100644
--- a/test/simple/test-http-url.parse-path.js
+++ b/test/parallel/test-http-url.parse-path.js
diff --git a/test/simple/test-http-url.parse-post.js b/test/parallel/test-http-url.parse-post.js
index be93166d53..be93166d53 100644
--- a/test/simple/test-http-url.parse-post.js
+++ b/test/parallel/test-http-url.parse-post.js
diff --git a/test/simple/test-http-url.parse-search.js b/test/parallel/test-http-url.parse-search.js
index 3b6727d0bf..3b6727d0bf 100644
--- a/test/simple/test-http-url.parse-search.js
+++ b/test/parallel/test-http-url.parse-search.js
diff --git a/test/simple/test-http-wget.js b/test/parallel/test-http-wget.js
index b6cf7d8be4..b6cf7d8be4 100644
--- a/test/simple/test-http-wget.js
+++ b/test/parallel/test-http-wget.js
diff --git a/test/simple/test-http-write-callbacks.js b/test/parallel/test-http-write-callbacks.js
index 3a740ae5ba..3a740ae5ba 100644
--- a/test/simple/test-http-write-callbacks.js
+++ b/test/parallel/test-http-write-callbacks.js
diff --git a/test/simple/test-http-write-empty-string.js b/test/parallel/test-http-write-empty-string.js
index baf9c27f4b..baf9c27f4b 100644
--- a/test/simple/test-http-write-empty-string.js
+++ b/test/parallel/test-http-write-empty-string.js
diff --git a/test/simple/test-http-write-head.js b/test/parallel/test-http-write-head.js
index 88923ef27a..88923ef27a 100644
--- a/test/simple/test-http-write-head.js
+++ b/test/parallel/test-http-write-head.js
diff --git a/test/simple/test-http-zero-length-write.js b/test/parallel/test-http-zero-length-write.js
index e68f947c32..e68f947c32 100644
--- a/test/simple/test-http-zero-length-write.js
+++ b/test/parallel/test-http-zero-length-write.js
diff --git a/test/simple/test-http.js b/test/parallel/test-http.js
index fa388356d8..fa388356d8 100644
--- a/test/simple/test-http.js
+++ b/test/parallel/test-http.js
diff --git a/test/simple/test-https-agent.js b/test/parallel/test-https-agent.js
index 34fa15c737..34fa15c737 100644
--- a/test/simple/test-https-agent.js
+++ b/test/parallel/test-https-agent.js
diff --git a/test/simple/test-https-byteswritten.js b/test/parallel/test-https-byteswritten.js
index 21c300efa7..21c300efa7 100644
--- a/test/simple/test-https-byteswritten.js
+++ b/test/parallel/test-https-byteswritten.js
diff --git a/test/simple/test-https-client-checkServerIdentity.js b/test/parallel/test-https-client-checkServerIdentity.js
index a985d23e58..a985d23e58 100644
--- a/test/simple/test-https-client-checkServerIdentity.js
+++ b/test/parallel/test-https-client-checkServerIdentity.js
diff --git a/test/simple/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js
index ae5613c143..ae5613c143 100644
--- a/test/simple/test-https-client-get-url.js
+++ b/test/parallel/test-https-client-get-url.js
diff --git a/test/simple/test-https-client-reject.js b/test/parallel/test-https-client-reject.js
index bf191da1d9..bf191da1d9 100644
--- a/test/simple/test-https-client-reject.js
+++ b/test/parallel/test-https-client-reject.js
diff --git a/test/simple/test-https-client-resume.js b/test/parallel/test-https-client-resume.js
index 0433afdd99..0433afdd99 100644
--- a/test/simple/test-https-client-resume.js
+++ b/test/parallel/test-https-client-resume.js
diff --git a/test/simple/test-https-connecting-to-http.js b/test/parallel/test-https-connecting-to-http.js
index 50bb2a8a3e..50bb2a8a3e 100644
--- a/test/simple/test-https-connecting-to-http.js
+++ b/test/parallel/test-https-connecting-to-http.js
diff --git a/test/simple/test-https-drain.js b/test/parallel/test-https-drain.js
index 5509a24744..5509a24744 100644
--- a/test/simple/test-https-drain.js
+++ b/test/parallel/test-https-drain.js
diff --git a/test/simple/test-https-eof-for-eom.js b/test/parallel/test-https-eof-for-eom.js
index 7a465b865d..7a465b865d 100644
--- a/test/simple/test-https-eof-for-eom.js
+++ b/test/parallel/test-https-eof-for-eom.js
diff --git a/test/simple/test-https-foafssl.js b/test/parallel/test-https-foafssl.js
index c9fc746e89..c9fc746e89 100644
--- a/test/simple/test-https-foafssl.js
+++ b/test/parallel/test-https-foafssl.js
diff --git a/test/simple/test-https-localaddress-bind-error.js b/test/parallel/test-https-localaddress-bind-error.js
index 0c4f8da4c4..0c4f8da4c4 100644
--- a/test/simple/test-https-localaddress-bind-error.js
+++ b/test/parallel/test-https-localaddress-bind-error.js
diff --git a/test/simple/test-https-localaddress.js b/test/parallel/test-https-localaddress.js
index f703d41aef..f703d41aef 100644
--- a/test/simple/test-https-localaddress.js
+++ b/test/parallel/test-https-localaddress.js
diff --git a/test/simple/test-https-pfx.js b/test/parallel/test-https-pfx.js
index 9da1ff8ee9..9da1ff8ee9 100644
--- a/test/simple/test-https-pfx.js
+++ b/test/parallel/test-https-pfx.js
diff --git a/test/simple/test-https-req-split.js b/test/parallel/test-https-req-split.js
index db54d72377..db54d72377 100644
--- a/test/simple/test-https-req-split.js
+++ b/test/parallel/test-https-req-split.js
diff --git a/test/simple/test-https-set-timeout-server.js b/test/parallel/test-https-set-timeout-server.js
index e4dc1e3605..e4dc1e3605 100644
--- a/test/simple/test-https-set-timeout-server.js
+++ b/test/parallel/test-https-set-timeout-server.js
diff --git a/test/simple/test-https-simple.js b/test/parallel/test-https-simple.js
index 552450c301..552450c301 100644
--- a/test/simple/test-https-simple.js
+++ b/test/parallel/test-https-simple.js
diff --git a/test/simple/test-https-socket-options.js b/test/parallel/test-https-socket-options.js
index 21b1118f7d..21b1118f7d 100644
--- a/test/simple/test-https-socket-options.js
+++ b/test/parallel/test-https-socket-options.js
diff --git a/test/simple/test-https-strict.js b/test/parallel/test-https-strict.js
index 9cd763f7ae..9cd763f7ae 100644
--- a/test/simple/test-https-strict.js
+++ b/test/parallel/test-https-strict.js
diff --git a/test/simple/test-https-timeout-server-2.js b/test/parallel/test-https-timeout-server-2.js
index 076a0ec26f..076a0ec26f 100644
--- a/test/simple/test-https-timeout-server-2.js
+++ b/test/parallel/test-https-timeout-server-2.js
diff --git a/test/simple/test-https-timeout-server.js b/test/parallel/test-https-timeout-server.js
index 57d6c57b59..57d6c57b59 100644
--- a/test/simple/test-https-timeout-server.js
+++ b/test/parallel/test-https-timeout-server.js
diff --git a/test/simple/test-https-timeout.js b/test/parallel/test-https-timeout.js
index 8b79204d46..8b79204d46 100644
--- a/test/simple/test-https-timeout.js
+++ b/test/parallel/test-https-timeout.js
diff --git a/test/simple/test-https-truncate.js b/test/parallel/test-https-truncate.js
index 889f916824..889f916824 100644
--- a/test/simple/test-https-truncate.js
+++ b/test/parallel/test-https-truncate.js
diff --git a/test/simple/test-listen-fd-cluster.js b/test/parallel/test-listen-fd-cluster.js
index 0d6d7748aa..0d6d7748aa 100644
--- a/test/simple/test-listen-fd-cluster.js
+++ b/test/parallel/test-listen-fd-cluster.js
diff --git a/test/simple/test-listen-fd-detached-inherit.js b/test/parallel/test-listen-fd-detached-inherit.js
index dabc46cd31..dabc46cd31 100644
--- a/test/simple/test-listen-fd-detached-inherit.js
+++ b/test/parallel/test-listen-fd-detached-inherit.js
diff --git a/test/simple/test-listen-fd-detached.js b/test/parallel/test-listen-fd-detached.js
index 3d98abeacd..3d98abeacd 100644
--- a/test/simple/test-listen-fd-detached.js
+++ b/test/parallel/test-listen-fd-detached.js
diff --git a/test/simple/test-listen-fd-ebadf.js b/test/parallel/test-listen-fd-ebadf.js
index 6c0f20ae43..6c0f20ae43 100644
--- a/test/simple/test-listen-fd-ebadf.js
+++ b/test/parallel/test-listen-fd-ebadf.js
diff --git a/test/simple/test-listen-fd-server.js b/test/parallel/test-listen-fd-server.js
index 8f3454fbbd..8f3454fbbd 100644
--- a/test/simple/test-listen-fd-server.js
+++ b/test/parallel/test-listen-fd-server.js
diff --git a/test/simple/test-memory-usage.js b/test/parallel/test-memory-usage.js
index 0df17420c9..0df17420c9 100644
--- a/test/simple/test-memory-usage.js
+++ b/test/parallel/test-memory-usage.js
diff --git a/test/simple/test-microtask-queue-integration-domain.js b/test/parallel/test-microtask-queue-integration-domain.js
index 2197bf9212..2197bf9212 100644
--- a/test/simple/test-microtask-queue-integration-domain.js
+++ b/test/parallel/test-microtask-queue-integration-domain.js
diff --git a/test/simple/test-microtask-queue-integration.js b/test/parallel/test-microtask-queue-integration.js
index af01548477..af01548477 100644
--- a/test/simple/test-microtask-queue-integration.js
+++ b/test/parallel/test-microtask-queue-integration.js
diff --git a/test/simple/test-microtask-queue-run-domain.js b/test/parallel/test-microtask-queue-run-domain.js
index 2b3b76315e..2b3b76315e 100644
--- a/test/simple/test-microtask-queue-run-domain.js
+++ b/test/parallel/test-microtask-queue-run-domain.js
diff --git a/test/simple/test-microtask-queue-run-immediate-domain.js b/test/parallel/test-microtask-queue-run-immediate-domain.js
index 8f95fadd58..8f95fadd58 100644
--- a/test/simple/test-microtask-queue-run-immediate-domain.js
+++ b/test/parallel/test-microtask-queue-run-immediate-domain.js
diff --git a/test/simple/test-microtask-queue-run-immediate.js b/test/parallel/test-microtask-queue-run-immediate.js
index b5423eb6b4..b5423eb6b4 100644
--- a/test/simple/test-microtask-queue-run-immediate.js
+++ b/test/parallel/test-microtask-queue-run-immediate.js
diff --git a/test/simple/test-microtask-queue-run.js b/test/parallel/test-microtask-queue-run.js
index c4138454f5..c4138454f5 100644
--- a/test/simple/test-microtask-queue-run.js
+++ b/test/parallel/test-microtask-queue-run.js
diff --git a/test/simple/test-module-globalpaths-nodepath.js b/test/parallel/test-module-globalpaths-nodepath.js
index c99b6763b4..c99b6763b4 100644
--- a/test/simple/test-module-globalpaths-nodepath.js
+++ b/test/parallel/test-module-globalpaths-nodepath.js
diff --git a/test/simple/test-module-loading-error.js b/test/parallel/test-module-loading-error.js
index beddb5d37b..beddb5d37b 100644
--- a/test/simple/test-module-loading-error.js
+++ b/test/parallel/test-module-loading-error.js
diff --git a/test/simple/test-module-nodemodulepaths.js b/test/parallel/test-module-nodemodulepaths.js
index 3d48d99ab9..3d48d99ab9 100644
--- a/test/simple/test-module-nodemodulepaths.js
+++ b/test/parallel/test-module-nodemodulepaths.js
diff --git a/test/simple/test-net-after-close.js b/test/parallel/test-net-after-close.js
index 2f3d4c3797..2f3d4c3797 100644
--- a/test/simple/test-net-after-close.js
+++ b/test/parallel/test-net-after-close.js
diff --git a/test/simple/test-net-better-error-messages-listen-path.js b/test/parallel/test-net-better-error-messages-listen-path.js
index fcc3062a81..fcc3062a81 100644
--- a/test/simple/test-net-better-error-messages-listen-path.js
+++ b/test/parallel/test-net-better-error-messages-listen-path.js
diff --git a/test/simple/test-net-better-error-messages-listen.js b/test/parallel/test-net-better-error-messages-listen.js
index 9c7766bd4f..9c7766bd4f 100644
--- a/test/simple/test-net-better-error-messages-listen.js
+++ b/test/parallel/test-net-better-error-messages-listen.js
diff --git a/test/simple/test-net-better-error-messages-path.js b/test/parallel/test-net-better-error-messages-path.js
index dea4a10459..dea4a10459 100644
--- a/test/simple/test-net-better-error-messages-path.js
+++ b/test/parallel/test-net-better-error-messages-path.js
diff --git a/test/simple/test-net-better-error-messages-port-hostname.js b/test/parallel/test-net-better-error-messages-port-hostname.js
index 3817dbb92f..3817dbb92f 100644
--- a/test/simple/test-net-better-error-messages-port-hostname.js
+++ b/test/parallel/test-net-better-error-messages-port-hostname.js
diff --git a/test/simple/test-net-better-error-messages-port.js b/test/parallel/test-net-better-error-messages-port.js
index a8c16a7038..a8c16a7038 100644
--- a/test/simple/test-net-better-error-messages-port.js
+++ b/test/parallel/test-net-better-error-messages-port.js
diff --git a/test/simple/test-net-binary.js b/test/parallel/test-net-binary.js
index 3100465846..3100465846 100644
--- a/test/simple/test-net-binary.js
+++ b/test/parallel/test-net-binary.js
diff --git a/test/simple/test-net-bind-twice.js b/test/parallel/test-net-bind-twice.js
index 58086cc966..58086cc966 100644
--- a/test/simple/test-net-bind-twice.js
+++ b/test/parallel/test-net-bind-twice.js
diff --git a/test/simple/test-net-buffersize.js b/test/parallel/test-net-buffersize.js
index 5759503a13..5759503a13 100644
--- a/test/simple/test-net-buffersize.js
+++ b/test/parallel/test-net-buffersize.js
diff --git a/test/simple/test-net-bytes-stats.js b/test/parallel/test-net-bytes-stats.js
index 0cb08009ee..0cb08009ee 100644
--- a/test/simple/test-net-bytes-stats.js
+++ b/test/parallel/test-net-bytes-stats.js
diff --git a/test/simple/test-net-can-reset-timeout.js b/test/parallel/test-net-can-reset-timeout.js
index b9ea97efe8..b9ea97efe8 100644
--- a/test/simple/test-net-can-reset-timeout.js
+++ b/test/parallel/test-net-can-reset-timeout.js
diff --git a/test/simple/test-net-connect-buffer.js b/test/parallel/test-net-connect-buffer.js
index 679e18e907..679e18e907 100644
--- a/test/simple/test-net-connect-buffer.js
+++ b/test/parallel/test-net-connect-buffer.js
diff --git a/test/simple/test-net-connect-handle-econnrefused.js b/test/parallel/test-net-connect-handle-econnrefused.js
index e890b6a8d4..e890b6a8d4 100644
--- a/test/simple/test-net-connect-handle-econnrefused.js
+++ b/test/parallel/test-net-connect-handle-econnrefused.js
diff --git a/test/simple/test-net-connect-immediate-finish.js b/test/parallel/test-net-connect-immediate-finish.js
index ac2a61331d..ac2a61331d 100644
--- a/test/simple/test-net-connect-immediate-finish.js
+++ b/test/parallel/test-net-connect-immediate-finish.js
diff --git a/test/simple/test-net-connect-options-ipv6.js b/test/parallel/test-net-connect-options-ipv6.js
index 9dd60c1cbd..9dd60c1cbd 100644
--- a/test/simple/test-net-connect-options-ipv6.js
+++ b/test/parallel/test-net-connect-options-ipv6.js
diff --git a/test/simple/test-net-connect-options.js b/test/parallel/test-net-connect-options.js
index 6be3696dae..6be3696dae 100644
--- a/test/simple/test-net-connect-options.js
+++ b/test/parallel/test-net-connect-options.js
diff --git a/test/simple/test-net-connect-paused-connection.js b/test/parallel/test-net-connect-paused-connection.js
index c38f51e36e..9d9db1040a 100644
--- a/test/simple/test-net-connect-paused-connection.js
+++ b/test/parallel/test-net-connect-paused-connection.js
@@ -26,9 +26,9 @@ var net = require('net');
 
 net.createServer(function(conn) {
   conn.unref();
-}).listen(8124).unref();
+}).listen(common.PORT).unref();
 
-net.connect(8124, 'localhost').pause();
+net.connect(common.PORT, 'localhost').pause();
 
 setTimeout(function() {
   assert.fail('expected to exit');
diff --git a/test/simple/test-net-create-connection.js b/test/parallel/test-net-create-connection.js
index 12f7f0be6d..12f7f0be6d 100644
--- a/test/simple/test-net-create-connection.js
+++ b/test/parallel/test-net-create-connection.js
diff --git a/test/simple/test-net-dns-error.js b/test/parallel/test-net-dns-error.js
index f7221389a2..f7221389a2 100644
--- a/test/simple/test-net-dns-error.js
+++ b/test/parallel/test-net-dns-error.js
diff --git a/test/simple/test-net-dns-lookup.js b/test/parallel/test-net-dns-lookup.js
index 5628e4d8a3..5628e4d8a3 100644
--- a/test/simple/test-net-dns-lookup.js
+++ b/test/parallel/test-net-dns-lookup.js
diff --git a/test/simple/test-net-during-close.js b/test/parallel/test-net-during-close.js
index 489d77479d..489d77479d 100644
--- a/test/simple/test-net-during-close.js
+++ b/test/parallel/test-net-during-close.js
diff --git a/test/simple/test-net-eaddrinuse.js b/test/parallel/test-net-eaddrinuse.js
index 2192ea2242..2192ea2242 100644
--- a/test/simple/test-net-eaddrinuse.js
+++ b/test/parallel/test-net-eaddrinuse.js
diff --git a/test/simple/test-net-end-without-connect.js b/test/parallel/test-net-end-without-connect.js
index 156071a0d1..156071a0d1 100644
--- a/test/simple/test-net-end-without-connect.js
+++ b/test/parallel/test-net-end-without-connect.js
diff --git a/test/simple/test-net-error-twice.js b/test/parallel/test-net-error-twice.js
index 955eea6c09..955eea6c09 100644
--- a/test/simple/test-net-error-twice.js
+++ b/test/parallel/test-net-error-twice.js
diff --git a/test/simple/test-net-isip.js b/test/parallel/test-net-isip.js
index 0d324007f2..0d324007f2 100644
--- a/test/simple/test-net-isip.js
+++ b/test/parallel/test-net-isip.js
diff --git a/test/simple/test-net-keepalive.js b/test/parallel/test-net-keepalive.js
index b09d9d5d68..b09d9d5d68 100644
--- a/test/simple/test-net-keepalive.js
+++ b/test/parallel/test-net-keepalive.js
diff --git a/test/simple/test-net-large-string.js b/test/parallel/test-net-large-string.js
index 877dc7c780..877dc7c780 100644
--- a/test/simple/test-net-large-string.js
+++ b/test/parallel/test-net-large-string.js
diff --git a/test/simple/test-net-listen-close-server.js b/test/parallel/test-net-listen-close-server.js
index 4a3233a8f7..4a3233a8f7 100644
--- a/test/simple/test-net-listen-close-server.js
+++ b/test/parallel/test-net-listen-close-server.js
diff --git a/test/simple/test-net-listen-error.js b/test/parallel/test-net-listen-error.js
index 17ec762caf..17ec762caf 100644
--- a/test/simple/test-net-listen-error.js
+++ b/test/parallel/test-net-listen-error.js
diff --git a/test/simple/test-net-listen-fd0.js b/test/parallel/test-net-listen-fd0.js
index ac5896ee8f..ac5896ee8f 100644
--- a/test/simple/test-net-listen-fd0.js
+++ b/test/parallel/test-net-listen-fd0.js
diff --git a/test/simple/test-net-listen-shared-ports.js b/test/parallel/test-net-listen-shared-ports.js
index 7422e491fc..7422e491fc 100644
--- a/test/simple/test-net-listen-shared-ports.js
+++ b/test/parallel/test-net-listen-shared-ports.js
diff --git a/test/simple/test-net-local-address-port.js b/test/parallel/test-net-local-address-port.js
index 0f59cec9b6..0f59cec9b6 100644
--- a/test/simple/test-net-local-address-port.js
+++ b/test/parallel/test-net-local-address-port.js
diff --git a/test/simple/test-net-localerror.js b/test/parallel/test-net-localerror.js
index c4d04aa921..c4d04aa921 100644
--- a/test/simple/test-net-localerror.js
+++ b/test/parallel/test-net-localerror.js
diff --git a/test/simple/test-net-pause-resume-connecting.js b/test/parallel/test-net-pause-resume-connecting.js
index 264dc96801..264dc96801 100644
--- a/test/simple/test-net-pause-resume-connecting.js
+++ b/test/parallel/test-net-pause-resume-connecting.js
diff --git a/test/simple/test-net-pingpong.js b/test/parallel/test-net-pingpong.js
index ff7c97a03e..ff7c97a03e 100644
--- a/test/simple/test-net-pingpong.js
+++ b/test/parallel/test-net-pingpong.js
diff --git a/test/simple/test-net-pipe-connect-errors.js b/test/parallel/test-net-pipe-connect-errors.js
index 07dd4fe4a2..07dd4fe4a2 100644
--- a/test/simple/test-net-pipe-connect-errors.js
+++ b/test/parallel/test-net-pipe-connect-errors.js
diff --git a/test/simple/test-net-reconnect-error.js b/test/parallel/test-net-reconnect-error.js
index 6094e943ca..6094e943ca 100644
--- a/test/simple/test-net-reconnect-error.js
+++ b/test/parallel/test-net-reconnect-error.js
diff --git a/test/simple/test-net-reconnect.js b/test/parallel/test-net-reconnect.js
index ffc2a73c63..ffc2a73c63 100644
--- a/test/simple/test-net-reconnect.js
+++ b/test/parallel/test-net-reconnect.js
diff --git a/test/simple/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js
index 0cfe47afe6..0cfe47afe6 100644
--- a/test/simple/test-net-remote-address-port.js
+++ b/test/parallel/test-net-remote-address-port.js
diff --git a/test/simple/test-net-server-close.js b/test/parallel/test-net-server-close.js
index afa83f10d6..afa83f10d6 100644
--- a/test/simple/test-net-server-close.js
+++ b/test/parallel/test-net-server-close.js
diff --git a/test/simple/test-net-server-connections.js b/test/parallel/test-net-server-connections.js
index 423fcb8e38..423fcb8e38 100644
--- a/test/simple/test-net-server-connections.js
+++ b/test/parallel/test-net-server-connections.js
diff --git a/test/simple/test-net-server-listen-remove-callback.js b/test/parallel/test-net-server-listen-remove-callback.js
index e10231de8c..e10231de8c 100644
--- a/test/simple/test-net-server-listen-remove-callback.js
+++ b/test/parallel/test-net-server-listen-remove-callback.js
diff --git a/test/simple/test-net-server-max-connections.js b/test/parallel/test-net-server-max-connections.js
index 43bc2fee17..43bc2fee17 100644
--- a/test/simple/test-net-server-max-connections.js
+++ b/test/parallel/test-net-server-max-connections.js
diff --git a/test/simple/test-net-server-pause-on-connect.js b/test/parallel/test-net-server-pause-on-connect.js
index 3a8255e8f7..3a8255e8f7 100644
--- a/test/simple/test-net-server-pause-on-connect.js
+++ b/test/parallel/test-net-server-pause-on-connect.js
diff --git a/test/simple/test-net-server-try-ports.js b/test/parallel/test-net-server-try-ports.js
index 5eca9d0957..5eca9d0957 100644
--- a/test/simple/test-net-server-try-ports.js
+++ b/test/parallel/test-net-server-try-ports.js
diff --git a/test/simple/test-net-server-unref.js b/test/parallel/test-net-server-unref.js
index d20cbe5068..f7f994babb 100644
--- a/test/simple/test-net-server-unref.js
+++ b/test/parallel/test-net-server-unref.js
@@ -26,7 +26,7 @@ var net = require('net');
 var closed = false;
 
 var s = net.createServer();
-s.listen();
+s.listen(common.PORT);
 s.unref();
 
 setTimeout(function() {
diff --git a/test/simple/test-net-settimeout.js b/test/parallel/test-net-settimeout.js
index da13385b94..da13385b94 100644
--- a/test/simple/test-net-settimeout.js
+++ b/test/parallel/test-net-settimeout.js
diff --git a/test/simple/test-net-socket-destroy-twice.js b/test/parallel/test-net-socket-destroy-twice.js
index 882e3a14ce..882e3a14ce 100644
--- a/test/simple/test-net-socket-destroy-twice.js
+++ b/test/parallel/test-net-socket-destroy-twice.js
diff --git a/test/simple/test-net-socket-timeout-unref.js b/test/parallel/test-net-socket-timeout-unref.js
index 32aef444a9..32aef444a9 100644
--- a/test/simple/test-net-socket-timeout-unref.js
+++ b/test/parallel/test-net-socket-timeout-unref.js
diff --git a/test/simple/test-net-socket-timeout.js b/test/parallel/test-net-socket-timeout.js
index 2256d6813a..2256d6813a 100644
--- a/test/simple/test-net-socket-timeout.js
+++ b/test/parallel/test-net-socket-timeout.js
diff --git a/test/simple/test-net-stream.js b/test/parallel/test-net-stream.js
index 9f2db51be8..9f2db51be8 100644
--- a/test/simple/test-net-stream.js
+++ b/test/parallel/test-net-stream.js
diff --git a/test/simple/test-net-write-after-close.js b/test/parallel/test-net-write-after-close.js
index 3b98bbc42e..3b98bbc42e 100644
--- a/test/simple/test-net-write-after-close.js
+++ b/test/parallel/test-net-write-after-close.js
diff --git a/test/simple/test-net-write-connect-write.js b/test/parallel/test-net-write-connect-write.js
index cb65af8a80..cb65af8a80 100644
--- a/test/simple/test-net-write-connect-write.js
+++ b/test/parallel/test-net-write-connect-write.js
diff --git a/test/simple/test-net-write-slow.js b/test/parallel/test-net-write-slow.js
index 468c311c5c..468c311c5c 100644
--- a/test/simple/test-net-write-slow.js
+++ b/test/parallel/test-net-write-slow.js
diff --git a/test/simple/test-next-tick-doesnt-hang.js b/test/parallel/test-next-tick-doesnt-hang.js
index 3d26bd3c6b..3d26bd3c6b 100644
--- a/test/simple/test-next-tick-doesnt-hang.js
+++ b/test/parallel/test-next-tick-doesnt-hang.js
diff --git a/test/simple/test-next-tick-domain.js b/test/parallel/test-next-tick-domain.js
index 16f77ed94d..16f77ed94d 100644
--- a/test/simple/test-next-tick-domain.js
+++ b/test/parallel/test-next-tick-domain.js
diff --git a/test/simple/test-next-tick-errors.js b/test/parallel/test-next-tick-errors.js
index bf3c2e3065..bf3c2e3065 100644
--- a/test/simple/test-next-tick-errors.js
+++ b/test/parallel/test-next-tick-errors.js
diff --git a/test/simple/test-next-tick-intentional-starvation.js b/test/parallel/test-next-tick-intentional-starvation.js
index 1a76b27e44..1a76b27e44 100644
--- a/test/simple/test-next-tick-intentional-starvation.js
+++ b/test/parallel/test-next-tick-intentional-starvation.js
diff --git a/test/simple/test-next-tick-ordering.js b/test/parallel/test-next-tick-ordering.js
index 5dc1dfbe16..5dc1dfbe16 100644
--- a/test/simple/test-next-tick-ordering.js
+++ b/test/parallel/test-next-tick-ordering.js
diff --git a/test/simple/test-next-tick-ordering2.js b/test/parallel/test-next-tick-ordering2.js
index 94fd20fbb5..94fd20fbb5 100644
--- a/test/simple/test-next-tick-ordering2.js
+++ b/test/parallel/test-next-tick-ordering2.js
diff --git a/test/simple/test-next-tick.js b/test/parallel/test-next-tick.js
index 2e40658c92..2e40658c92 100644
--- a/test/simple/test-next-tick.js
+++ b/test/parallel/test-next-tick.js
diff --git a/test/simple/test-os.js b/test/parallel/test-os.js
index 5763e071bf..5763e071bf 100644
--- a/test/simple/test-os.js
+++ b/test/parallel/test-os.js
diff --git a/test/simple/test-path-makelong.js b/test/parallel/test-path-makelong.js
index d9d8efd405..d9d8efd405 100644
--- a/test/simple/test-path-makelong.js
+++ b/test/parallel/test-path-makelong.js
diff --git a/test/simple/test-path-parse-format.js b/test/parallel/test-path-parse-format.js
index 4f6e5af45c..4f6e5af45c 100644
--- a/test/simple/test-path-parse-format.js
+++ b/test/parallel/test-path-parse-format.js
diff --git a/test/simple/test-path.js b/test/parallel/test-path.js
index 7a8a1b14a9..45fd282d08 100644
--- a/test/simple/test-path.js
+++ b/test/parallel/test-path.js
@@ -61,8 +61,8 @@ if (!isWindows) {
 
 assert.equal(path.extname(f), '.js');
 
-assert.equal(path.dirname(f).substr(-11),
-             isWindows ? 'test\\simple' : 'test/simple');
+assert.equal(path.dirname(f).substr(-13),
+             isWindows ? 'test\\parallel' : 'test/parallel');
 assert.equal(path.dirname('/a/b/'), '/a');
 assert.equal(path.dirname('/a/b'), '/a');
 assert.equal(path.dirname('/a'), '/');
diff --git a/test/simple/test-pipe-file-to-http.js b/test/parallel/test-pipe-file-to-http.js
index 1b3ba7089b..1b3ba7089b 100644
--- a/test/simple/test-pipe-file-to-http.js
+++ b/test/parallel/test-pipe-file-to-http.js
diff --git a/test/simple/test-pipe-return-val.js b/test/parallel/test-pipe-return-val.js
index 274e9f5bc6..274e9f5bc6 100644
--- a/test/simple/test-pipe-return-val.js
+++ b/test/parallel/test-pipe-return-val.js
diff --git a/test/simple/test-process-active-wraps.js b/test/parallel/test-process-active-wraps.js
index 63fc218deb..63fc218deb 100644
--- a/test/simple/test-process-active-wraps.js
+++ b/test/parallel/test-process-active-wraps.js
diff --git a/test/simple/test-process-argv-0.js b/test/parallel/test-process-argv-0.js
index 0c38f6ac7b..0c38f6ac7b 100644
--- a/test/simple/test-process-argv-0.js
+++ b/test/parallel/test-process-argv-0.js
diff --git a/test/simple/test-process-before-exit.js b/test/parallel/test-process-before-exit.js
index 261ac253c5..261ac253c5 100644
--- a/test/simple/test-process-before-exit.js
+++ b/test/parallel/test-process-before-exit.js
diff --git a/test/simple/test-process-binding.js b/test/parallel/test-process-binding.js
index c803a8083f..c803a8083f 100644
--- a/test/simple/test-process-binding.js
+++ b/test/parallel/test-process-binding.js
diff --git a/test/simple/test-process-config.js b/test/parallel/test-process-config.js
index b3236cd5ec..b3236cd5ec 100644
--- a/test/simple/test-process-config.js
+++ b/test/parallel/test-process-config.js
diff --git a/test/simple/test-process-env.js b/test/parallel/test-process-env.js
index 919d0d54ed..919d0d54ed 100644
--- a/test/simple/test-process-env.js
+++ b/test/parallel/test-process-env.js
diff --git a/test/simple/test-process-exec-argv.js b/test/parallel/test-process-exec-argv.js
index 395753b72a..395753b72a 100644
--- a/test/simple/test-process-exec-argv.js
+++ b/test/parallel/test-process-exec-argv.js
diff --git a/test/simple/test-process-exit-code.js b/test/parallel/test-process-exit-code.js
index 2488175d3d..2488175d3d 100644
--- a/test/simple/test-process-exit-code.js
+++ b/test/parallel/test-process-exit-code.js
diff --git a/test/simple/test-process-exit-from-before-exit.js b/test/parallel/test-process-exit-from-before-exit.js
index 4818a6c196..4818a6c196 100644
--- a/test/simple/test-process-exit-from-before-exit.js
+++ b/test/parallel/test-process-exit-from-before-exit.js
diff --git a/test/simple/test-process-exit-recursive.js b/test/parallel/test-process-exit-recursive.js
index ba5b5dc5b0..ba5b5dc5b0 100644
--- a/test/simple/test-process-exit-recursive.js
+++ b/test/parallel/test-process-exit-recursive.js
diff --git a/test/simple/test-process-exit.js b/test/parallel/test-process-exit.js
index 365d5f1093..365d5f1093 100644
--- a/test/simple/test-process-exit.js
+++ b/test/parallel/test-process-exit.js
diff --git a/test/simple/test-process-getgroups.js b/test/parallel/test-process-getgroups.js
index 16d017b3cc..16d017b3cc 100644
--- a/test/simple/test-process-getgroups.js
+++ b/test/parallel/test-process-getgroups.js
diff --git a/test/simple/test-process-hrtime.js b/test/parallel/test-process-hrtime.js
index d8ffcafa9c..d8ffcafa9c 100644
--- a/test/simple/test-process-hrtime.js
+++ b/test/parallel/test-process-hrtime.js
diff --git a/test/simple/test-process-kill-null.js b/test/parallel/test-process-kill-null.js
index 520210ef1f..520210ef1f 100644
--- a/test/simple/test-process-kill-null.js
+++ b/test/parallel/test-process-kill-null.js
diff --git a/test/simple/test-process-kill-pid.js b/test/parallel/test-process-kill-pid.js
index 6e4e7d83a7..6e4e7d83a7 100644
--- a/test/simple/test-process-kill-pid.js
+++ b/test/parallel/test-process-kill-pid.js
diff --git a/test/simple/test-process-next-tick.js b/test/parallel/test-process-next-tick.js
index 0322a033e3..0322a033e3 100644
--- a/test/simple/test-process-next-tick.js
+++ b/test/parallel/test-process-next-tick.js
diff --git a/test/simple/test-process-raw-debug.js b/test/parallel/test-process-raw-debug.js
index 3c14c9eb51..3c14c9eb51 100644
--- a/test/simple/test-process-raw-debug.js
+++ b/test/parallel/test-process-raw-debug.js
diff --git a/test/simple/test-process-wrap.js b/test/parallel/test-process-wrap.js
index 892b028e3f..892b028e3f 100644
--- a/test/simple/test-process-wrap.js
+++ b/test/parallel/test-process-wrap.js
diff --git a/test/simple/test-punycode.js b/test/parallel/test-punycode.js
index fa6a9c0ec9..fa6a9c0ec9 100644
--- a/test/simple/test-punycode.js
+++ b/test/parallel/test-punycode.js
diff --git a/test/simple/test-querystring.js b/test/parallel/test-querystring.js
index 6bb3fe7c69..6bb3fe7c69 100644
--- a/test/simple/test-querystring.js
+++ b/test/parallel/test-querystring.js
diff --git a/test/simple/test-readdouble.js b/test/parallel/test-readdouble.js
index 6749e5b202..6749e5b202 100644
--- a/test/simple/test-readdouble.js
+++ b/test/parallel/test-readdouble.js
diff --git a/test/simple/test-readfloat.js b/test/parallel/test-readfloat.js
index 586b992c5b..586b992c5b 100644
--- a/test/simple/test-readfloat.js
+++ b/test/parallel/test-readfloat.js
diff --git a/test/simple/test-readint.js b/test/parallel/test-readint.js
index f1b79e816a..f1b79e816a 100644
--- a/test/simple/test-readint.js
+++ b/test/parallel/test-readint.js
diff --git a/test/simple/test-readline-interface.js b/test/parallel/test-readline-interface.js
index b86dd5a8a9..b86dd5a8a9 100644
--- a/test/simple/test-readline-interface.js
+++ b/test/parallel/test-readline-interface.js
diff --git a/test/simple/test-readline-set-raw-mode.js b/test/parallel/test-readline-set-raw-mode.js
index f43443857b..f43443857b 100644
--- a/test/simple/test-readline-set-raw-mode.js
+++ b/test/parallel/test-readline-set-raw-mode.js
diff --git a/test/simple/test-readuint.js b/test/parallel/test-readuint.js
index 2b11a61c92..2b11a61c92 100644
--- a/test/simple/test-readuint.js
+++ b/test/parallel/test-readuint.js
diff --git a/test/simple/test-regress-GH-4256.js b/test/parallel/test-regress-GH-4256.js
index 9f937cc099..9f937cc099 100644
--- a/test/simple/test-regress-GH-4256.js
+++ b/test/parallel/test-regress-GH-4256.js
diff --git a/test/simple/test-regress-GH-5927.js b/test/parallel/test-regress-GH-5927.js
index 5f8f276616..5f8f276616 100644
--- a/test/simple/test-regress-GH-5927.js
+++ b/test/parallel/test-regress-GH-5927.js
diff --git a/test/simple/test-regress-GH-6235.js b/test/parallel/test-regress-GH-6235.js
index e830f7bbee..e830f7bbee 100644
--- a/test/simple/test-regress-GH-6235.js
+++ b/test/parallel/test-regress-GH-6235.js
diff --git a/test/simple/test-regress-GH-7511.js b/test/parallel/test-regress-GH-7511.js
index 9694f0499e..9694f0499e 100644
--- a/test/simple/test-regress-GH-7511.js
+++ b/test/parallel/test-regress-GH-7511.js
diff --git a/test/simple/test-regress-GH-897.js b/test/parallel/test-regress-GH-897.js
index dd4399f16f..dd4399f16f 100644
--- a/test/simple/test-regress-GH-897.js
+++ b/test/parallel/test-regress-GH-897.js
diff --git a/test/simple/test-regression-object-prototype.js b/test/parallel/test-regression-object-prototype.js
index 158532ad87..158532ad87 100644
--- a/test/simple/test-regression-object-prototype.js
+++ b/test/parallel/test-regression-object-prototype.js
diff --git a/test/simple/test-repl-.save.load.js b/test/parallel/test-repl-.save.load.js
index fdbf18fa0b..fdbf18fa0b 100644
--- a/test/simple/test-repl-.save.load.js
+++ b/test/parallel/test-repl-.save.load.js
diff --git a/test/simple/test-repl-autolibs.js b/test/parallel/test-repl-autolibs.js
index b6f9294711..b6f9294711 100644
--- a/test/simple/test-repl-autolibs.js
+++ b/test/parallel/test-repl-autolibs.js
diff --git a/test/simple/test-repl-console.js b/test/parallel/test-repl-console.js
index 3dca14b7f3..3dca14b7f3 100644
--- a/test/simple/test-repl-console.js
+++ b/test/parallel/test-repl-console.js
diff --git a/test/simple/test-repl-domain.js b/test/parallel/test-repl-domain.js
index 55b7dc475e..55b7dc475e 100644
--- a/test/simple/test-repl-domain.js
+++ b/test/parallel/test-repl-domain.js
diff --git a/test/simple/test-repl-end-emits-exit.js b/test/parallel/test-repl-end-emits-exit.js
index 46eca2efbf..46eca2efbf 100644
--- a/test/simple/test-repl-end-emits-exit.js
+++ b/test/parallel/test-repl-end-emits-exit.js
diff --git a/test/simple/test-repl-harmony.js b/test/parallel/test-repl-harmony.js
index 701dd5ed67..701dd5ed67 100644
--- a/test/simple/test-repl-harmony.js
+++ b/test/parallel/test-repl-harmony.js
diff --git a/test/simple/test-repl-options.js b/test/parallel/test-repl-options.js
index 94a622da26..94a622da26 100644
--- a/test/simple/test-repl-options.js
+++ b/test/parallel/test-repl-options.js
diff --git a/test/simple/test-repl-require-cache.js b/test/parallel/test-repl-require-cache.js
index fe5753d215..fe5753d215 100644
--- a/test/simple/test-repl-require-cache.js
+++ b/test/parallel/test-repl-require-cache.js
diff --git a/test/simple/test-repl-reset-event.js b/test/parallel/test-repl-reset-event.js
index 3554d17b9e..3554d17b9e 100644
--- a/test/simple/test-repl-reset-event.js
+++ b/test/parallel/test-repl-reset-event.js
diff --git a/test/simple/test-repl-setprompt.js b/test/parallel/test-repl-setprompt.js
index e5021c2356..e5021c2356 100644
--- a/test/simple/test-repl-setprompt.js
+++ b/test/parallel/test-repl-setprompt.js
diff --git a/test/simple/test-repl-syntax-error-handling.js b/test/parallel/test-repl-syntax-error-handling.js
index 74328f4492..74328f4492 100644
--- a/test/simple/test-repl-syntax-error-handling.js
+++ b/test/parallel/test-repl-syntax-error-handling.js
diff --git a/test/simple/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js
index 48df4033d0..48df4033d0 100644
--- a/test/simple/test-repl-tab-complete.js
+++ b/test/parallel/test-repl-tab-complete.js
diff --git a/test/simple/test-repl-timeout-throw.js b/test/parallel/test-repl-timeout-throw.js
index 28f370909b..28f370909b 100644
--- a/test/simple/test-repl-timeout-throw.js
+++ b/test/parallel/test-repl-timeout-throw.js
diff --git a/test/simple/test-repl.js b/test/parallel/test-repl.js
index 69b9b54d1e..69b9b54d1e 100644
--- a/test/simple/test-repl.js
+++ b/test/parallel/test-repl.js
diff --git a/test/simple/test-require-cache.js b/test/parallel/test-require-cache.js
index 2f812044a7..2f812044a7 100644
--- a/test/simple/test-require-cache.js
+++ b/test/parallel/test-require-cache.js
diff --git a/test/simple/test-require-exceptions.js b/test/parallel/test-require-exceptions.js
index 307e3e2f33..307e3e2f33 100644
--- a/test/simple/test-require-exceptions.js
+++ b/test/parallel/test-require-exceptions.js
diff --git a/test/simple/test-require-extensions-main.js b/test/parallel/test-require-extensions-main.js
index 032f2eb2c9..032f2eb2c9 100644
--- a/test/simple/test-require-extensions-main.js
+++ b/test/parallel/test-require-extensions-main.js
diff --git a/test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js b/test/parallel/test-require-extensions-same-filename-as-dir-trailing-slash.js
index 6469d14ffd..6469d14ffd 100644
--- a/test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js
+++ b/test/parallel/test-require-extensions-same-filename-as-dir-trailing-slash.js
diff --git a/test/simple/test-require-extensions-same-filename-as-dir.js b/test/parallel/test-require-extensions-same-filename-as-dir.js
index fbfba3b9bc..fbfba3b9bc 100644
--- a/test/simple/test-require-extensions-same-filename-as-dir.js
+++ b/test/parallel/test-require-extensions-same-filename-as-dir.js
diff --git a/test/simple/test-require-json.js b/test/parallel/test-require-json.js
index 59b1e3d61f..59b1e3d61f 100644
--- a/test/simple/test-require-json.js
+++ b/test/parallel/test-require-json.js
diff --git a/test/simple/test-require-resolve.js b/test/parallel/test-require-resolve.js
index 490deae687..490deae687 100644
--- a/test/simple/test-require-resolve.js
+++ b/test/parallel/test-require-resolve.js
diff --git a/test/simple/test-signal-handler.js b/test/parallel/test-signal-handler.js
index 5531e2f556..5531e2f556 100644
--- a/test/simple/test-signal-handler.js
+++ b/test/parallel/test-signal-handler.js
diff --git a/test/simple/test-signal-safety.js b/test/parallel/test-signal-safety.js
index 4707b634da..4707b634da 100644
--- a/test/simple/test-signal-safety.js
+++ b/test/parallel/test-signal-safety.js
diff --git a/test/simple/test-smalloc.js b/test/parallel/test-smalloc.js
index 198b5c7f5c..198b5c7f5c 100644
--- a/test/simple/test-smalloc.js
+++ b/test/parallel/test-smalloc.js
diff --git a/test/simple/test-stdin-hang.js b/test/parallel/test-stdin-hang.js
index 1edbf8c25b..1edbf8c25b 100644
--- a/test/simple/test-stdin-hang.js
+++ b/test/parallel/test-stdin-hang.js
diff --git a/test/simple/test-stdin-pause-resume-sync.js b/test/parallel/test-stdin-pause-resume-sync.js
index 0e202a3063..0e202a3063 100644
--- a/test/simple/test-stdin-pause-resume-sync.js
+++ b/test/parallel/test-stdin-pause-resume-sync.js
diff --git a/test/simple/test-stdin-pause-resume.js b/test/parallel/test-stdin-pause-resume.js
index fed5d66532..fed5d66532 100644
--- a/test/simple/test-stdin-pause-resume.js
+++ b/test/parallel/test-stdin-pause-resume.js
diff --git a/test/simple/test-stdin-resume-pause.js b/test/parallel/test-stdin-resume-pause.js
index 2d2af2fc66..2d2af2fc66 100644
--- a/test/simple/test-stdin-resume-pause.js
+++ b/test/parallel/test-stdin-resume-pause.js
diff --git a/test/simple/test-stdio-readable-writable.js b/test/parallel/test-stdio-readable-writable.js
index 5123f96887..5123f96887 100644
--- a/test/simple/test-stdio-readable-writable.js
+++ b/test/parallel/test-stdio-readable-writable.js
diff --git a/test/simple/test-stdout-close-unref.js b/test/parallel/test-stdout-close-unref.js
index f8cbc7e4b6..f8cbc7e4b6 100644
--- a/test/simple/test-stdout-close-unref.js
+++ b/test/parallel/test-stdout-close-unref.js
diff --git a/test/simple/test-stream-big-packet.js b/test/parallel/test-stream-big-packet.js
index 9ec29ca0dc..9ec29ca0dc 100644
--- a/test/simple/test-stream-big-packet.js
+++ b/test/parallel/test-stream-big-packet.js
diff --git a/test/simple/test-stream-big-push.js b/test/parallel/test-stream-big-push.js
index e3787e4412..e3787e4412 100644
--- a/test/simple/test-stream-big-push.js
+++ b/test/parallel/test-stream-big-push.js
diff --git a/test/simple/test-stream-duplex.js b/test/parallel/test-stream-duplex.js
index 61f314939b..61f314939b 100644
--- a/test/simple/test-stream-duplex.js
+++ b/test/parallel/test-stream-duplex.js
diff --git a/test/simple/test-stream-end-paused.js b/test/parallel/test-stream-end-paused.js
index bb7377776b..bb7377776b 100644
--- a/test/simple/test-stream-end-paused.js
+++ b/test/parallel/test-stream-end-paused.js
diff --git a/test/simple/test-stream-ispaused.js b/test/parallel/test-stream-ispaused.js
index 91f4f512f0..91f4f512f0 100644
--- a/test/simple/test-stream-ispaused.js
+++ b/test/parallel/test-stream-ispaused.js
diff --git a/test/simple/test-stream-pipe-after-end.js b/test/parallel/test-stream-pipe-after-end.js
index b46ee90ad7..b46ee90ad7 100644
--- a/test/simple/test-stream-pipe-after-end.js
+++ b/test/parallel/test-stream-pipe-after-end.js
diff --git a/test/simple/test-stream-pipe-cleanup.js b/test/parallel/test-stream-pipe-cleanup.js
index f689358524..f689358524 100644
--- a/test/simple/test-stream-pipe-cleanup.js
+++ b/test/parallel/test-stream-pipe-cleanup.js
diff --git a/test/simple/test-stream-pipe-error-handling.js b/test/parallel/test-stream-pipe-error-handling.js
index c5d724b782..c5d724b782 100644
--- a/test/simple/test-stream-pipe-error-handling.js
+++ b/test/parallel/test-stream-pipe-error-handling.js
diff --git a/test/simple/test-stream-pipe-event.js b/test/parallel/test-stream-pipe-event.js
index cb9d5fe8ca..cb9d5fe8ca 100644
--- a/test/simple/test-stream-pipe-event.js
+++ b/test/parallel/test-stream-pipe-event.js
diff --git a/test/simple/test-stream-push-order.js b/test/parallel/test-stream-push-order.js
index f2e6ec29ce..f2e6ec29ce 100644
--- a/test/simple/test-stream-push-order.js
+++ b/test/parallel/test-stream-push-order.js
diff --git a/test/simple/test-stream-push-strings.js b/test/parallel/test-stream-push-strings.js
index 06f43dc1c8..06f43dc1c8 100644
--- a/test/simple/test-stream-push-strings.js
+++ b/test/parallel/test-stream-push-strings.js
diff --git a/test/simple/test-stream-readable-event.js b/test/parallel/test-stream-readable-event.js
index ba6a57724d..ba6a57724d 100644
--- a/test/simple/test-stream-readable-event.js
+++ b/test/parallel/test-stream-readable-event.js
diff --git a/test/simple/test-stream-readable-flow-recursion.js b/test/parallel/test-stream-readable-flow-recursion.js
index 2891ad6db8..2891ad6db8 100644
--- a/test/simple/test-stream-readable-flow-recursion.js
+++ b/test/parallel/test-stream-readable-flow-recursion.js
diff --git a/test/simple/test-stream-transform-objectmode-falsey-value.js b/test/parallel/test-stream-transform-objectmode-falsey-value.js
index 31b5bbaaf5..31b5bbaaf5 100644
--- a/test/simple/test-stream-transform-objectmode-falsey-value.js
+++ b/test/parallel/test-stream-transform-objectmode-falsey-value.js
diff --git a/test/simple/test-stream-transform-split-objectmode.js b/test/parallel/test-stream-transform-split-objectmode.js
index 72a2f0acec..72a2f0acec 100644
--- a/test/simple/test-stream-transform-split-objectmode.js
+++ b/test/parallel/test-stream-transform-split-objectmode.js
diff --git a/test/simple/test-stream-unshift-empty-chunk.js b/test/parallel/test-stream-unshift-empty-chunk.js
index 0c9647650f..0c9647650f 100644
--- a/test/simple/test-stream-unshift-empty-chunk.js
+++ b/test/parallel/test-stream-unshift-empty-chunk.js
diff --git a/test/simple/test-stream-unshift-read-race.js b/test/parallel/test-stream-unshift-read-race.js
index 83fd9fa203..83fd9fa203 100644
--- a/test/simple/test-stream-unshift-read-race.js
+++ b/test/parallel/test-stream-unshift-read-race.js
diff --git a/test/simple/test-stream-writable-change-default-encoding.js b/test/parallel/test-stream-writable-change-default-encoding.js
index eb71cf2b4a..eb71cf2b4a 100644
--- a/test/simple/test-stream-writable-change-default-encoding.js
+++ b/test/parallel/test-stream-writable-change-default-encoding.js
diff --git a/test/simple/test-stream-writable-decoded-encoding.js b/test/parallel/test-stream-writable-decoded-encoding.js
index 8e2624b259..8e2624b259 100644
--- a/test/simple/test-stream-writable-decoded-encoding.js
+++ b/test/parallel/test-stream-writable-decoded-encoding.js
diff --git a/test/simple/test-stream-writev.js b/test/parallel/test-stream-writev.js
index 5b49e6e416..5b49e6e416 100644
--- a/test/simple/test-stream-writev.js
+++ b/test/parallel/test-stream-writev.js
diff --git a/test/simple/test-stream2-base64-single-char-read-end.js b/test/parallel/test-stream2-base64-single-char-read-end.js
index 5a3834128c..5a3834128c 100644
--- a/test/simple/test-stream2-base64-single-char-read-end.js
+++ b/test/parallel/test-stream2-base64-single-char-read-end.js
diff --git a/test/simple/test-stream2-compatibility.js b/test/parallel/test-stream2-compatibility.js
index 6cdd4e9948..6cdd4e9948 100644
--- a/test/simple/test-stream2-compatibility.js
+++ b/test/parallel/test-stream2-compatibility.js
diff --git a/test/simple/test-stream2-finish-pipe.js b/test/parallel/test-stream2-finish-pipe.js
index 39b274f977..39b274f977 100644
--- a/test/simple/test-stream2-finish-pipe.js
+++ b/test/parallel/test-stream2-finish-pipe.js
diff --git a/test/simple/test-stream2-large-read-stall.js b/test/parallel/test-stream2-large-read-stall.js
index 2fbfbcab3f..2fbfbcab3f 100644
--- a/test/simple/test-stream2-large-read-stall.js
+++ b/test/parallel/test-stream2-large-read-stall.js
diff --git a/test/simple/test-stream2-objects.js b/test/parallel/test-stream2-objects.js
index 3e6931dce0..3e6931dce0 100644
--- a/test/simple/test-stream2-objects.js
+++ b/test/parallel/test-stream2-objects.js
diff --git a/test/simple/test-stream2-pipe-error-handling.js b/test/parallel/test-stream2-pipe-error-handling.js
index cf7531cbd3..cf7531cbd3 100644
--- a/test/simple/test-stream2-pipe-error-handling.js
+++ b/test/parallel/test-stream2-pipe-error-handling.js
diff --git a/test/simple/test-stream2-pipe-error-once-listener.js b/test/parallel/test-stream2-pipe-error-once-listener.js
index 5e8e3cb283..5e8e3cb283 100755
--- a/test/simple/test-stream2-pipe-error-once-listener.js
+++ b/test/parallel/test-stream2-pipe-error-once-listener.js
diff --git a/test/simple/test-stream2-push.js b/test/parallel/test-stream2-push.js
index b63edc3084..b63edc3084 100644
--- a/test/simple/test-stream2-push.js
+++ b/test/parallel/test-stream2-push.js
diff --git a/test/simple/test-stream2-read-sync-stack.js b/test/parallel/test-stream2-read-sync-stack.js
index e8a73053c8..e8a73053c8 100644
--- a/test/simple/test-stream2-read-sync-stack.js
+++ b/test/parallel/test-stream2-read-sync-stack.js
diff --git a/test/simple/test-stream2-readable-empty-buffer-no-eof.js b/test/parallel/test-stream2-readable-empty-buffer-no-eof.js
index d52af5edb8..d52af5edb8 100644
--- a/test/simple/test-stream2-readable-empty-buffer-no-eof.js
+++ b/test/parallel/test-stream2-readable-empty-buffer-no-eof.js
diff --git a/test/simple/test-stream2-readable-from-list.js b/test/parallel/test-stream2-readable-from-list.js
index 7c96ffe00c..7c96ffe00c 100644
--- a/test/simple/test-stream2-readable-from-list.js
+++ b/test/parallel/test-stream2-readable-from-list.js
diff --git a/test/simple/test-stream2-readable-legacy-drain.js b/test/parallel/test-stream2-readable-legacy-drain.js
index 117e253d26..117e253d26 100644
--- a/test/simple/test-stream2-readable-legacy-drain.js
+++ b/test/parallel/test-stream2-readable-legacy-drain.js
diff --git a/test/simple/test-stream2-readable-non-empty-end.js b/test/parallel/test-stream2-readable-non-empty-end.js
index 65b7afda57..65b7afda57 100644
--- a/test/simple/test-stream2-readable-non-empty-end.js
+++ b/test/parallel/test-stream2-readable-non-empty-end.js
diff --git a/test/simple/test-stream2-readable-wrap-empty.js b/test/parallel/test-stream2-readable-wrap-empty.js
index 2e5cf25c44..2e5cf25c44 100644
--- a/test/simple/test-stream2-readable-wrap-empty.js
+++ b/test/parallel/test-stream2-readable-wrap-empty.js
diff --git a/test/simple/test-stream2-readable-wrap.js b/test/parallel/test-stream2-readable-wrap.js
index 293774ca5c..293774ca5c 100644
--- a/test/simple/test-stream2-readable-wrap.js
+++ b/test/parallel/test-stream2-readable-wrap.js
diff --git a/test/simple/test-stream2-set-encoding.js b/test/parallel/test-stream2-set-encoding.js
index 9b28e55942..9b28e55942 100644
--- a/test/simple/test-stream2-set-encoding.js
+++ b/test/parallel/test-stream2-set-encoding.js
diff --git a/test/simple/test-stream2-transform.js b/test/parallel/test-stream2-transform.js
index 9c9ddd8efc..9c9ddd8efc 100644
--- a/test/simple/test-stream2-transform.js
+++ b/test/parallel/test-stream2-transform.js
diff --git a/test/simple/test-stream2-unpipe-drain.js b/test/parallel/test-stream2-unpipe-drain.js
index d66dc3cbec..d66dc3cbec 100644
--- a/test/simple/test-stream2-unpipe-drain.js
+++ b/test/parallel/test-stream2-unpipe-drain.js
diff --git a/test/simple/test-stream2-unpipe-leak.js b/test/parallel/test-stream2-unpipe-leak.js
index 99f8746c49..99f8746c49 100644
--- a/test/simple/test-stream2-unpipe-leak.js
+++ b/test/parallel/test-stream2-unpipe-leak.js
diff --git a/test/simple/test-stream2-writable.js b/test/parallel/test-stream2-writable.js
index 3767ce140e..3767ce140e 100644
--- a/test/simple/test-stream2-writable.js
+++ b/test/parallel/test-stream2-writable.js
diff --git a/test/simple/test-stream3-pause-then-read.js b/test/parallel/test-stream3-pause-then-read.js
index b91bde3f0a..b91bde3f0a 100644
--- a/test/simple/test-stream3-pause-then-read.js
+++ b/test/parallel/test-stream3-pause-then-read.js
diff --git a/test/simple/test-string-decoder-end.js b/test/parallel/test-string-decoder-end.js
index fea55d410b..fea55d410b 100644
--- a/test/simple/test-string-decoder-end.js
+++ b/test/parallel/test-string-decoder-end.js
diff --git a/test/simple/test-string-decoder.js b/test/parallel/test-string-decoder.js
index 9f47d131bb..9f47d131bb 100644
--- a/test/simple/test-string-decoder.js
+++ b/test/parallel/test-string-decoder.js
diff --git a/test/simple/test-stringbytes-external.js b/test/parallel/test-stringbytes-external.js
index c7c716c836..c7c716c836 100644
--- a/test/simple/test-stringbytes-external.js
+++ b/test/parallel/test-stringbytes-external.js
diff --git a/test/simple/test-sys.js b/test/parallel/test-sys.js
index 6ea33161c5..6ea33161c5 100644
--- a/test/simple/test-sys.js
+++ b/test/parallel/test-sys.js
diff --git a/test/simple/test-tcp-wrap.js b/test/parallel/test-tcp-wrap.js
index bc1e14e68a..bc1e14e68a 100644
--- a/test/simple/test-tcp-wrap.js
+++ b/test/parallel/test-tcp-wrap.js
diff --git a/test/simple/test-timers-first-fire.js b/test/parallel/test-timers-first-fire.js
index e97b7ec852..e97b7ec852 100644
--- a/test/simple/test-timers-first-fire.js
+++ b/test/parallel/test-timers-first-fire.js
diff --git a/test/simple/test-timers-immediate-queue.js b/test/parallel/test-timers-immediate-queue.js
index cce43a1aca..cce43a1aca 100644
--- a/test/simple/test-timers-immediate-queue.js
+++ b/test/parallel/test-timers-immediate-queue.js
diff --git a/test/simple/test-timers-immediate.js b/test/parallel/test-timers-immediate.js
index 0bd8ae9642..0bd8ae9642 100644
--- a/test/simple/test-timers-immediate.js
+++ b/test/parallel/test-timers-immediate.js
diff --git a/test/simple/test-timers-linked-list.js b/test/parallel/test-timers-linked-list.js
index 0b6bf4bef8..0b6bf4bef8 100644
--- a/test/simple/test-timers-linked-list.js
+++ b/test/parallel/test-timers-linked-list.js
diff --git a/test/simple/test-timers-non-integer-delay.js b/test/parallel/test-timers-non-integer-delay.js
index db9bedafa8..db9bedafa8 100644
--- a/test/simple/test-timers-non-integer-delay.js
+++ b/test/parallel/test-timers-non-integer-delay.js
diff --git a/test/simple/test-timers-ordering.js b/test/parallel/test-timers-ordering.js
index 30cc44e53a..30cc44e53a 100644
--- a/test/simple/test-timers-ordering.js
+++ b/test/parallel/test-timers-ordering.js
diff --git a/test/simple/test-timers-this.js b/test/parallel/test-timers-this.js
index 3d23e61dff..3d23e61dff 100644
--- a/test/simple/test-timers-this.js
+++ b/test/parallel/test-timers-this.js
diff --git a/test/simple/test-timers-uncaught-exception.js b/test/parallel/test-timers-uncaught-exception.js
index 6e07fe084e..6e07fe084e 100644
--- a/test/simple/test-timers-uncaught-exception.js
+++ b/test/parallel/test-timers-uncaught-exception.js
diff --git a/test/simple/test-timers-unref.js b/test/parallel/test-timers-unref.js
index 1c362cb836..1c362cb836 100644
--- a/test/simple/test-timers-unref.js
+++ b/test/parallel/test-timers-unref.js
diff --git a/test/simple/test-timers-zero-timeout.js b/test/parallel/test-timers-zero-timeout.js
index eb43f183f8..eb43f183f8 100644
--- a/test/simple/test-timers-zero-timeout.js
+++ b/test/parallel/test-timers-zero-timeout.js
diff --git a/test/simple/test-timers.js b/test/parallel/test-timers.js
index 98e6bc3def..98e6bc3def 100644
--- a/test/simple/test-timers.js
+++ b/test/parallel/test-timers.js
diff --git a/test/simple/test-tls-0-dns-altname.js b/test/parallel/test-tls-0-dns-altname.js
index 002a5ca3c1..002a5ca3c1 100644
--- a/test/simple/test-tls-0-dns-altname.js
+++ b/test/parallel/test-tls-0-dns-altname.js
diff --git a/test/simple/test-tls-alert.js b/test/parallel/test-tls-alert.js
index f26b496f9d..f26b496f9d 100644
--- a/test/simple/test-tls-alert.js
+++ b/test/parallel/test-tls-alert.js
diff --git a/test/simple/test-tls-cert-regression.js b/test/parallel/test-tls-cert-regression.js
index ec8369ba98..ec8369ba98 100644
--- a/test/simple/test-tls-cert-regression.js
+++ b/test/parallel/test-tls-cert-regression.js
diff --git a/test/simple/test-tls-check-server-identity.js b/test/parallel/test-tls-check-server-identity.js
index 598dac0e00..598dac0e00 100644
--- a/test/simple/test-tls-check-server-identity.js
+++ b/test/parallel/test-tls-check-server-identity.js
diff --git a/test/simple/test-tls-client-abort.js b/test/parallel/test-tls-client-abort.js
index 8958ceb158..8958ceb158 100644
--- a/test/simple/test-tls-client-abort.js
+++ b/test/parallel/test-tls-client-abort.js
diff --git a/test/simple/test-tls-client-abort2.js b/test/parallel/test-tls-client-abort2.js
index f811962768..f811962768 100644
--- a/test/simple/test-tls-client-abort2.js
+++ b/test/parallel/test-tls-client-abort2.js
diff --git a/test/simple/test-tls-client-default-ciphers.js b/test/parallel/test-tls-client-default-ciphers.js
index 0a3c470292..0a3c470292 100644
--- a/test/simple/test-tls-client-default-ciphers.js
+++ b/test/parallel/test-tls-client-default-ciphers.js
diff --git a/test/simple/test-tls-client-destroy-soon.js b/test/parallel/test-tls-client-destroy-soon.js
index 529b84a734..529b84a734 100644
--- a/test/simple/test-tls-client-destroy-soon.js
+++ b/test/parallel/test-tls-client-destroy-soon.js
diff --git a/test/simple/test-tls-client-reject.js b/test/parallel/test-tls-client-reject.js
index bae9614982..bae9614982 100644
--- a/test/simple/test-tls-client-reject.js
+++ b/test/parallel/test-tls-client-reject.js
diff --git a/test/simple/test-tls-client-resume.js b/test/parallel/test-tls-client-resume.js
index 7271134df1..7271134df1 100644
--- a/test/simple/test-tls-client-resume.js
+++ b/test/parallel/test-tls-client-resume.js
diff --git a/test/simple/test-tls-client-verify.js b/test/parallel/test-tls-client-verify.js
index 590dfc6e63..590dfc6e63 100644
--- a/test/simple/test-tls-client-verify.js
+++ b/test/parallel/test-tls-client-verify.js
diff --git a/test/simple/test-tls-close-notify.js b/test/parallel/test-tls-close-notify.js
index 3c6bf53f21..3c6bf53f21 100644
--- a/test/simple/test-tls-close-notify.js
+++ b/test/parallel/test-tls-close-notify.js
diff --git a/test/simple/test-tls-connect-given-socket.js b/test/parallel/test-tls-connect-given-socket.js
index ab571c7a81..ab571c7a81 100644
--- a/test/simple/test-tls-connect-given-socket.js
+++ b/test/parallel/test-tls-connect-given-socket.js
diff --git a/test/simple/test-tls-connect-pipe.js b/test/parallel/test-tls-connect-pipe.js
index 98031c0ad1..98031c0ad1 100644
--- a/test/simple/test-tls-connect-pipe.js
+++ b/test/parallel/test-tls-connect-pipe.js
diff --git a/test/simple/test-tls-connect-simple.js b/test/parallel/test-tls-connect-simple.js
index e896dd9e22..e896dd9e22 100644
--- a/test/simple/test-tls-connect-simple.js
+++ b/test/parallel/test-tls-connect-simple.js
diff --git a/test/simple/test-tls-connect.js b/test/parallel/test-tls-connect.js
index 616f76c05c..616f76c05c 100644
--- a/test/simple/test-tls-connect.js
+++ b/test/parallel/test-tls-connect.js
diff --git a/test/simple/test-tls-delayed-attach.js b/test/parallel/test-tls-delayed-attach.js
index ceacedc738..ceacedc738 100644
--- a/test/simple/test-tls-delayed-attach.js
+++ b/test/parallel/test-tls-delayed-attach.js
diff --git a/test/simple/test-tls-dhe.js b/test/parallel/test-tls-dhe.js
index 3975c5ed40..3975c5ed40 100644
--- a/test/simple/test-tls-dhe.js
+++ b/test/parallel/test-tls-dhe.js
diff --git a/test/simple/test-tls-ecdh-disable.js b/test/parallel/test-tls-ecdh-disable.js
index 06b4e4ffd6..06b4e4ffd6 100644
--- a/test/simple/test-tls-ecdh-disable.js
+++ b/test/parallel/test-tls-ecdh-disable.js
diff --git a/test/simple/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js
index 446d76c837..446d76c837 100644
--- a/test/simple/test-tls-ecdh.js
+++ b/test/parallel/test-tls-ecdh.js
diff --git a/test/simple/test-tls-econnreset.js b/test/parallel/test-tls-econnreset.js
index fcadf13f0c..fcadf13f0c 100644
--- a/test/simple/test-tls-econnreset.js
+++ b/test/parallel/test-tls-econnreset.js
diff --git a/test/simple/test-tls-fast-writing.js b/test/parallel/test-tls-fast-writing.js
index 894ec346a5..894ec346a5 100644
--- a/test/simple/test-tls-fast-writing.js
+++ b/test/parallel/test-tls-fast-writing.js
diff --git a/test/simple/test-tls-friendly-error-message.js b/test/parallel/test-tls-friendly-error-message.js
index 39fb302316..b589907659 100644
--- a/test/simple/test-tls-friendly-error-message.js
+++ b/test/parallel/test-tls-friendly-error-message.js
@@ -35,7 +35,7 @@ var cert = fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem');
 tls.createServer({ key: key, cert: cert }, function(conn) {
   conn.end();
   this.close();
-}).listen(0, function() {
+}).listen(common.PORT, function() {
   var options = { port: this.address().port, rejectUnauthorized: true };
   tls.connect(options).on('error', common.mustCall(function(err) {
     assert.equal(err.code, 'UNABLE_TO_VERIFY_LEAF_SIGNATURE');
diff --git a/test/simple/test-tls-getcipher.js b/test/parallel/test-tls-getcipher.js
index 22a280e587..22a280e587 100644
--- a/test/simple/test-tls-getcipher.js
+++ b/test/parallel/test-tls-getcipher.js
diff --git a/test/simple/test-tls-handshake-nohang.js b/test/parallel/test-tls-handshake-nohang.js
index de36ebb500..de36ebb500 100644
--- a/test/simple/test-tls-handshake-nohang.js
+++ b/test/parallel/test-tls-handshake-nohang.js
diff --git a/test/simple/test-tls-hello-parser-failure.js b/test/parallel/test-tls-hello-parser-failure.js
index b6c0ac2283..b6c0ac2283 100644
--- a/test/simple/test-tls-hello-parser-failure.js
+++ b/test/parallel/test-tls-hello-parser-failure.js
diff --git a/test/simple/test-tls-inception.js b/test/parallel/test-tls-inception.js
index d15d1ebd43..d15d1ebd43 100644
--- a/test/simple/test-tls-inception.js
+++ b/test/parallel/test-tls-inception.js
diff --git a/test/simple/test-tls-interleave.js b/test/parallel/test-tls-interleave.js
index 8bebb807e5..8bebb807e5 100644
--- a/test/simple/test-tls-interleave.js
+++ b/test/parallel/test-tls-interleave.js
diff --git a/test/simple/test-tls-invoke-queued.js b/test/parallel/test-tls-invoke-queued.js
index 3e877b406f..3e877b406f 100644
--- a/test/simple/test-tls-invoke-queued.js
+++ b/test/parallel/test-tls-invoke-queued.js
diff --git a/test/simple/test-tls-junk-closes-server.js b/test/parallel/test-tls-junk-closes-server.js
index 57db7f5a39..57db7f5a39 100644
--- a/test/simple/test-tls-junk-closes-server.js
+++ b/test/parallel/test-tls-junk-closes-server.js
diff --git a/test/simple/test-tls-key-mismatch.js b/test/parallel/test-tls-key-mismatch.js
index f99e9471fd..f99e9471fd 100644
--- a/test/simple/test-tls-key-mismatch.js
+++ b/test/parallel/test-tls-key-mismatch.js
diff --git a/test/simple/test-tls-max-send-fragment.js b/test/parallel/test-tls-max-send-fragment.js
index f6fdf25120..f6fdf25120 100644
--- a/test/simple/test-tls-max-send-fragment.js
+++ b/test/parallel/test-tls-max-send-fragment.js
diff --git a/test/simple/test-tls-multi-key.js b/test/parallel/test-tls-multi-key.js
index e00c404093..e00c404093 100644
--- a/test/simple/test-tls-multi-key.js
+++ b/test/parallel/test-tls-multi-key.js
diff --git a/test/simple/test-tls-no-cert-required.js b/test/parallel/test-tls-no-cert-required.js
index 48e6c59404..35121477ff 100644
--- a/test/simple/test-tls-no-cert-required.js
+++ b/test/parallel/test-tls-no-cert-required.js
@@ -30,6 +30,6 @@ var tls = require('tls');
 // Omitting the cert or pfx option to tls.createServer() should not throw.
 // AECDH-NULL-SHA is a no-authentication/no-encryption cipher and hence
 // doesn't need a certificate.
-tls.createServer({ ciphers: 'AECDH-NULL-SHA' }).listen(0, function() {
+tls.createServer({ ciphers: 'AECDH-NULL-SHA' }).listen(common.PORT, function() {
   this.close();
 });
diff --git a/test/simple/test-tls-no-rsa-key.js b/test/parallel/test-tls-no-rsa-key.js
index d50eab942e..d50eab942e 100644
--- a/test/simple/test-tls-no-rsa-key.js
+++ b/test/parallel/test-tls-no-rsa-key.js
diff --git a/test/simple/test-tls-npn-server-client.js b/test/parallel/test-tls-npn-server-client.js
index 0849cc8d2e..0849cc8d2e 100644
--- a/test/simple/test-tls-npn-server-client.js
+++ b/test/parallel/test-tls-npn-server-client.js
diff --git a/test/simple/test-tls-ocsp-callback.js b/test/parallel/test-tls-ocsp-callback.js
index 4c7dd1d442..4c7dd1d442 100644
--- a/test/simple/test-tls-ocsp-callback.js
+++ b/test/parallel/test-tls-ocsp-callback.js
diff --git a/test/simple/test-tls-over-http-tunnel.js b/test/parallel/test-tls-over-http-tunnel.js
index 9fa82ae3ee..9fa82ae3ee 100644
--- a/test/simple/test-tls-over-http-tunnel.js
+++ b/test/parallel/test-tls-over-http-tunnel.js
diff --git a/test/simple/test-tls-passphrase.js b/test/parallel/test-tls-passphrase.js
index e9a5c5a5df..e9a5c5a5df 100644
--- a/test/simple/test-tls-passphrase.js
+++ b/test/parallel/test-tls-passphrase.js
diff --git a/test/simple/test-tls-pause.js b/test/parallel/test-tls-pause.js
index 5eaac8da19..5eaac8da19 100644
--- a/test/simple/test-tls-pause.js
+++ b/test/parallel/test-tls-pause.js
diff --git a/test/simple/test-tls-peer-certificate-encoding.js b/test/parallel/test-tls-peer-certificate-encoding.js
index 288236a93c..288236a93c 100644
--- a/test/simple/test-tls-peer-certificate-encoding.js
+++ b/test/parallel/test-tls-peer-certificate-encoding.js
diff --git a/test/simple/test-tls-peer-certificate-multi-keys.js b/test/parallel/test-tls-peer-certificate-multi-keys.js
index a321d2cbaa..a321d2cbaa 100644
--- a/test/simple/test-tls-peer-certificate-multi-keys.js
+++ b/test/parallel/test-tls-peer-certificate-multi-keys.js
diff --git a/test/simple/test-tls-peer-certificate.js b/test/parallel/test-tls-peer-certificate.js
index f1d0a7f197..f1d0a7f197 100644
--- a/test/simple/test-tls-peer-certificate.js
+++ b/test/parallel/test-tls-peer-certificate.js
diff --git a/test/simple/test-tls-request-timeout.js b/test/parallel/test-tls-request-timeout.js
index 7f46bd2130..7f46bd2130 100644
--- a/test/simple/test-tls-request-timeout.js
+++ b/test/parallel/test-tls-request-timeout.js
diff --git a/test/simple/test-tls-securepair-server.js b/test/parallel/test-tls-securepair-server.js
index ece965c544..ece965c544 100644
--- a/test/simple/test-tls-securepair-server.js
+++ b/test/parallel/test-tls-securepair-server.js
diff --git a/test/simple/test-tls-server-verify.js b/test/parallel/test-tls-server-verify.js
index 085749af43..085749af43 100644
--- a/test/simple/test-tls-server-verify.js
+++ b/test/parallel/test-tls-server-verify.js
diff --git a/test/simple/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js
index d5db30ce11..d5db30ce11 100644
--- a/test/simple/test-tls-session-cache.js
+++ b/test/parallel/test-tls-session-cache.js
diff --git a/test/simple/test-tls-set-ciphers.js b/test/parallel/test-tls-set-ciphers.js
index 1571d5e833..1571d5e833 100644
--- a/test/simple/test-tls-set-ciphers.js
+++ b/test/parallel/test-tls-set-ciphers.js
diff --git a/test/simple/test-tls-set-encoding.js b/test/parallel/test-tls-set-encoding.js
index 0f6beafd1d..0f6beafd1d 100644
--- a/test/simple/test-tls-set-encoding.js
+++ b/test/parallel/test-tls-set-encoding.js
diff --git a/test/simple/test-tls-sni-option.js b/test/parallel/test-tls-sni-option.js
index 57c17163a7..57c17163a7 100644
--- a/test/simple/test-tls-sni-option.js
+++ b/test/parallel/test-tls-sni-option.js
diff --git a/test/simple/test-tls-sni-server-client.js b/test/parallel/test-tls-sni-server-client.js
index 31fc419428..31fc419428 100644
--- a/test/simple/test-tls-sni-server-client.js
+++ b/test/parallel/test-tls-sni-server-client.js
diff --git a/test/simple/test-tls-ticket-cluster.js b/test/parallel/test-tls-ticket-cluster.js
index 22fe10c42b..22fe10c42b 100644
--- a/test/simple/test-tls-ticket-cluster.js
+++ b/test/parallel/test-tls-ticket-cluster.js
diff --git a/test/simple/test-tls-ticket.js b/test/parallel/test-tls-ticket.js
index 471d8c3ce8..471d8c3ce8 100644
--- a/test/simple/test-tls-ticket.js
+++ b/test/parallel/test-tls-ticket.js
diff --git a/test/simple/test-tls-timeout-server-2.js b/test/parallel/test-tls-timeout-server-2.js
index dfa9be3dee..dfa9be3dee 100644
--- a/test/simple/test-tls-timeout-server-2.js
+++ b/test/parallel/test-tls-timeout-server-2.js
diff --git a/test/simple/test-tls-timeout-server.js b/test/parallel/test-tls-timeout-server.js
index 2c9b973ab3..2c9b973ab3 100644
--- a/test/simple/test-tls-timeout-server.js
+++ b/test/parallel/test-tls-timeout-server.js
diff --git a/test/simple/test-tls-zero-clear-in.js b/test/parallel/test-tls-zero-clear-in.js
index 22f45b6634..22f45b6634 100644
--- a/test/simple/test-tls-zero-clear-in.js
+++ b/test/parallel/test-tls-zero-clear-in.js
diff --git a/test/simple/test-tty-stdout-end.js b/test/parallel/test-tty-stdout-end.js
index 1fc2790683..1fc2790683 100644
--- a/test/simple/test-tty-stdout-end.js
+++ b/test/parallel/test-tty-stdout-end.js
diff --git a/test/simple/test-tty-wrap.js b/test/parallel/test-tty-wrap.js
index 610b92b43f..610b92b43f 100644
--- a/test/simple/test-tty-wrap.js
+++ b/test/parallel/test-tty-wrap.js
diff --git a/test/simple/test-umask.js b/test/parallel/test-umask.js
index a41c46b55f..a41c46b55f 100644
--- a/test/simple/test-umask.js
+++ b/test/parallel/test-umask.js
diff --git a/test/simple/test-url.js b/test/parallel/test-url.js
index f12a00dbed..f12a00dbed 100644
--- a/test/simple/test-url.js
+++ b/test/parallel/test-url.js
diff --git a/test/simple/test-utf8-scripts.js b/test/parallel/test-utf8-scripts.js
index 4639304f87..4639304f87 100644
--- a/test/simple/test-utf8-scripts.js
+++ b/test/parallel/test-utf8-scripts.js
diff --git a/test/simple/test-util-format.js b/test/parallel/test-util-format.js
index 1bea1bf211..1bea1bf211 100644
--- a/test/simple/test-util-format.js
+++ b/test/parallel/test-util-format.js
diff --git a/test/simple/test-util-inspect.js b/test/parallel/test-util-inspect.js
index 2a7c2c4fcb..2a7c2c4fcb 100644
--- a/test/simple/test-util-inspect.js
+++ b/test/parallel/test-util-inspect.js
diff --git a/test/simple/test-util-log.js b/test/parallel/test-util-log.js
index 1912c69f87..1912c69f87 100644
--- a/test/simple/test-util-log.js
+++ b/test/parallel/test-util-log.js
diff --git a/test/simple/test-util.js b/test/parallel/test-util.js
index 4e75d512c2..4e75d512c2 100644
--- a/test/simple/test-util.js
+++ b/test/parallel/test-util.js
diff --git a/test/simple/test-v8-flags.js b/test/parallel/test-v8-flags.js
index 1397d8bedd..1397d8bedd 100644
--- a/test/simple/test-v8-flags.js
+++ b/test/parallel/test-v8-flags.js
diff --git a/test/simple/test-v8-gc.js b/test/parallel/test-v8-gc.js
index 4bce8099d8..4bce8099d8 100644
--- a/test/simple/test-v8-gc.js
+++ b/test/parallel/test-v8-gc.js
diff --git a/test/simple/test-v8-stats.js b/test/parallel/test-v8-stats.js
index d4623363a5..d4623363a5 100644
--- a/test/simple/test-v8-stats.js
+++ b/test/parallel/test-v8-stats.js
diff --git a/test/simple/test-vm-basic.js b/test/parallel/test-vm-basic.js
index 680a81a4bc..680a81a4bc 100644
--- a/test/simple/test-vm-basic.js
+++ b/test/parallel/test-vm-basic.js
diff --git a/test/simple/test-vm-context-async-script.js b/test/parallel/test-vm-context-async-script.js
index d201e98eb2..d201e98eb2 100644
--- a/test/simple/test-vm-context-async-script.js
+++ b/test/parallel/test-vm-context-async-script.js
diff --git a/test/simple/test-vm-context-property-forwarding.js b/test/parallel/test-vm-context-property-forwarding.js
index 6d51463ad6..6d51463ad6 100644
--- a/test/simple/test-vm-context-property-forwarding.js
+++ b/test/parallel/test-vm-context-property-forwarding.js
diff --git a/test/simple/test-vm-context.js b/test/parallel/test-vm-context.js
index c843addc69..c843addc69 100644
--- a/test/simple/test-vm-context.js
+++ b/test/parallel/test-vm-context.js
diff --git a/test/simple/test-vm-create-and-run-in-context.js b/test/parallel/test-vm-create-and-run-in-context.js
index 863569ce78..863569ce78 100644
--- a/test/simple/test-vm-create-and-run-in-context.js
+++ b/test/parallel/test-vm-create-and-run-in-context.js
diff --git a/test/simple/test-vm-create-context-accessors.js b/test/parallel/test-vm-create-context-accessors.js
index f0622245be..f0622245be 100644
--- a/test/simple/test-vm-create-context-accessors.js
+++ b/test/parallel/test-vm-create-context-accessors.js
diff --git a/test/simple/test-vm-create-context-arg.js b/test/parallel/test-vm-create-context-arg.js
index 8c49a37363..8c49a37363 100644
--- a/test/simple/test-vm-create-context-arg.js
+++ b/test/parallel/test-vm-create-context-arg.js
diff --git a/test/simple/test-vm-create-context-circular-reference.js b/test/parallel/test-vm-create-context-circular-reference.js
index ae5b48c81c..ae5b48c81c 100644
--- a/test/simple/test-vm-create-context-circular-reference.js
+++ b/test/parallel/test-vm-create-context-circular-reference.js
diff --git a/test/simple/test-vm-cross-context.js b/test/parallel/test-vm-cross-context.js
index 6f5d501fe0..6f5d501fe0 100644
--- a/test/simple/test-vm-cross-context.js
+++ b/test/parallel/test-vm-cross-context.js
diff --git a/test/simple/test-vm-debug-context.js b/test/parallel/test-vm-debug-context.js
index 5569b3853c..5569b3853c 100644
--- a/test/simple/test-vm-debug-context.js
+++ b/test/parallel/test-vm-debug-context.js
diff --git a/test/simple/test-vm-function-declaration.js b/test/parallel/test-vm-function-declaration.js
index 58772ba2f5..58772ba2f5 100644
--- a/test/simple/test-vm-function-declaration.js
+++ b/test/parallel/test-vm-function-declaration.js
diff --git a/test/simple/test-vm-global-define-property.js b/test/parallel/test-vm-global-define-property.js
index fcfe489c1a..fcfe489c1a 100644
--- a/test/simple/test-vm-global-define-property.js
+++ b/test/parallel/test-vm-global-define-property.js
diff --git a/test/simple/test-vm-global-identity.js b/test/parallel/test-vm-global-identity.js
index adfb323584..adfb323584 100644
--- a/test/simple/test-vm-global-identity.js
+++ b/test/parallel/test-vm-global-identity.js
diff --git a/test/simple/test-vm-harmony-proxies.js b/test/parallel/test-vm-harmony-proxies.js
index e1b4ec8ad2..e1b4ec8ad2 100644
--- a/test/simple/test-vm-harmony-proxies.js
+++ b/test/parallel/test-vm-harmony-proxies.js
diff --git a/test/simple/test-vm-harmony-symbols.js b/test/parallel/test-vm-harmony-symbols.js
index 200084fdf4..200084fdf4 100644
--- a/test/simple/test-vm-harmony-symbols.js
+++ b/test/parallel/test-vm-harmony-symbols.js
diff --git a/test/simple/test-vm-is-context.js b/test/parallel/test-vm-is-context.js
index 9ef2037fe0..9ef2037fe0 100644
--- a/test/simple/test-vm-is-context.js
+++ b/test/parallel/test-vm-is-context.js
diff --git a/test/simple/test-vm-new-script-new-context.js b/test/parallel/test-vm-new-script-new-context.js
index 139d854291..139d854291 100644
--- a/test/simple/test-vm-new-script-new-context.js
+++ b/test/parallel/test-vm-new-script-new-context.js
diff --git a/test/simple/test-vm-new-script-this-context.js b/test/parallel/test-vm-new-script-this-context.js
index ff0b5b36f7..ff0b5b36f7 100644
--- a/test/simple/test-vm-new-script-this-context.js
+++ b/test/parallel/test-vm-new-script-this-context.js
diff --git a/test/simple/test-vm-run-in-new-context.js b/test/parallel/test-vm-run-in-new-context.js
index ecb80bdbc0..ecb80bdbc0 100644
--- a/test/simple/test-vm-run-in-new-context.js
+++ b/test/parallel/test-vm-run-in-new-context.js
diff --git a/test/simple/test-vm-static-this.js b/test/parallel/test-vm-static-this.js
index 860fbf04dd..860fbf04dd 100644
--- a/test/simple/test-vm-static-this.js
+++ b/test/parallel/test-vm-static-this.js
diff --git a/test/simple/test-vm-timeout.js b/test/parallel/test-vm-timeout.js
index 8ad2a234bb..8ad2a234bb 100644
--- a/test/simple/test-vm-timeout.js
+++ b/test/parallel/test-vm-timeout.js
diff --git a/test/simple/test-writedouble.js b/test/parallel/test-writedouble.js
index a700a82b42..a700a82b42 100644
--- a/test/simple/test-writedouble.js
+++ b/test/parallel/test-writedouble.js
diff --git a/test/simple/test-writefloat.js b/test/parallel/test-writefloat.js
index 0b4d21532e..0b4d21532e 100644
--- a/test/simple/test-writefloat.js
+++ b/test/parallel/test-writefloat.js
diff --git a/test/simple/test-writeint.js b/test/parallel/test-writeint.js
index 10540b6bd7..10540b6bd7 100644
--- a/test/simple/test-writeint.js
+++ b/test/parallel/test-writeint.js
diff --git a/test/simple/test-writeuint.js b/test/parallel/test-writeuint.js
index da0d795281..da0d795281 100644
--- a/test/simple/test-writeuint.js
+++ b/test/parallel/test-writeuint.js
diff --git a/test/simple/test-zlib-close-after-write.js b/test/parallel/test-zlib-close-after-write.js
index f0f176008f..f0f176008f 100644
--- a/test/simple/test-zlib-close-after-write.js
+++ b/test/parallel/test-zlib-close-after-write.js
diff --git a/test/simple/test-zlib-convenience-methods.js b/test/parallel/test-zlib-convenience-methods.js
index 88cf82f04c..88cf82f04c 100644
--- a/test/simple/test-zlib-convenience-methods.js
+++ b/test/parallel/test-zlib-convenience-methods.js
diff --git a/test/simple/test-zlib-dictionary-fail.js b/test/parallel/test-zlib-dictionary-fail.js
index fd35a0192a..fd35a0192a 100644
--- a/test/simple/test-zlib-dictionary-fail.js
+++ b/test/parallel/test-zlib-dictionary-fail.js
diff --git a/test/simple/test-zlib-dictionary.js b/test/parallel/test-zlib-dictionary.js
index 58da810ccd..58da810ccd 100644
--- a/test/simple/test-zlib-dictionary.js
+++ b/test/parallel/test-zlib-dictionary.js
diff --git a/test/simple/test-zlib-flush.js b/test/parallel/test-zlib-flush.js
index 0b189cecdd..0b189cecdd 100644
--- a/test/simple/test-zlib-flush.js
+++ b/test/parallel/test-zlib-flush.js
diff --git a/test/simple/test-zlib-from-gzip.js b/test/parallel/test-zlib-from-gzip.js
index 3993542099..3993542099 100644
--- a/test/simple/test-zlib-from-gzip.js
+++ b/test/parallel/test-zlib-from-gzip.js
diff --git a/test/simple/test-zlib-from-multiple-gzip-with-garbage.js b/test/parallel/test-zlib-from-multiple-gzip-with-garbage.js
index f6a0185e01..f6a0185e01 100644
--- a/test/simple/test-zlib-from-multiple-gzip-with-garbage.js
+++ b/test/parallel/test-zlib-from-multiple-gzip-with-garbage.js
diff --git a/test/simple/test-zlib-from-multiple-gzip.js b/test/parallel/test-zlib-from-multiple-gzip.js
index 6f4127a4d3..6f4127a4d3 100644
--- a/test/simple/test-zlib-from-multiple-gzip.js
+++ b/test/parallel/test-zlib-from-multiple-gzip.js
diff --git a/test/simple/test-zlib-from-multiple-huge-gzip.js b/test/parallel/test-zlib-from-multiple-huge-gzip.js
index 5533aafeb7..5533aafeb7 100644
--- a/test/simple/test-zlib-from-multiple-huge-gzip.js
+++ b/test/parallel/test-zlib-from-multiple-huge-gzip.js
diff --git a/test/simple/test-zlib-from-string.js b/test/parallel/test-zlib-from-string.js
index 83bdeea83a..83bdeea83a 100644
--- a/test/simple/test-zlib-from-string.js
+++ b/test/parallel/test-zlib-from-string.js
diff --git a/test/simple/test-zlib-invalid-input.js b/test/parallel/test-zlib-invalid-input.js
index c3d8b5b47a..c3d8b5b47a 100644
--- a/test/simple/test-zlib-invalid-input.js
+++ b/test/parallel/test-zlib-invalid-input.js
diff --git a/test/simple/test-zlib-params.js b/test/parallel/test-zlib-params.js
index 006f1ea8e5..006f1ea8e5 100644
--- a/test/simple/test-zlib-params.js
+++ b/test/parallel/test-zlib-params.js
diff --git a/test/simple/test-zlib-random-byte-pipes.js b/test/parallel/test-zlib-random-byte-pipes.js
index fc1db1cbba..fc1db1cbba 100644
--- a/test/simple/test-zlib-random-byte-pipes.js
+++ b/test/parallel/test-zlib-random-byte-pipes.js
diff --git a/test/simple/test-zlib-write-after-close.js b/test/parallel/test-zlib-write-after-close.js
index d3f3d4e6b3..d3f3d4e6b3 100644
--- a/test/simple/test-zlib-write-after-close.js
+++ b/test/parallel/test-zlib-write-after-close.js
diff --git a/test/simple/test-zlib-write-after-flush.js b/test/parallel/test-zlib-write-after-flush.js
index e13871ecb6..e13871ecb6 100644
--- a/test/simple/test-zlib-write-after-flush.js
+++ b/test/parallel/test-zlib-write-after-flush.js
diff --git a/test/simple/test-zlib-zero-byte.js b/test/parallel/test-zlib-zero-byte.js
index 31ac86bd6a..31ac86bd6a 100644
--- a/test/simple/test-zlib-zero-byte.js
+++ b/test/parallel/test-zlib-zero-byte.js
diff --git a/test/simple/test-zlib.js b/test/parallel/test-zlib.js
index b9267525ee..b9267525ee 100644
--- a/test/simple/test-zlib.js
+++ b/test/parallel/test-zlib.js
diff --git a/test/simple/testcfg.py b/test/parallel/testcfg.py
index 3d9b6296bb..8b610b50b1 100644
--- a/test/simple/testcfg.py
+++ b/test/parallel/testcfg.py
@@ -3,4 +3,4 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import testpy
 
 def GetConfiguration(context, root):
-  return testpy.SimpleTestConfiguration(context, root, 'simple')
+  return testpy.ParallelTestConfiguration(context, root, 'parallel')
diff --git a/test/simple/test-chdir.js b/test/sequential/test-chdir.js
index 7454bee2d3..7454bee2d3 100644
--- a/test/simple/test-chdir.js
+++ b/test/sequential/test-chdir.js
diff --git a/test/simple/test-child-process-emfile.js b/test/sequential/test-child-process-emfile.js
index 323bbb0a38..323bbb0a38 100644
--- a/test/simple/test-child-process-emfile.js
+++ b/test/sequential/test-child-process-emfile.js
diff --git a/test/simple/test-child-process-execsync.js b/test/sequential/test-child-process-execsync.js
index e97de721f6..e97de721f6 100644
--- a/test/simple/test-child-process-execsync.js
+++ b/test/sequential/test-child-process-execsync.js
diff --git a/test/simple/test-child-process-fork-getconnections.js b/test/sequential/test-child-process-fork-getconnections.js
index f8fed6884f..f8fed6884f 100644
--- a/test/simple/test-child-process-fork-getconnections.js
+++ b/test/sequential/test-child-process-fork-getconnections.js
diff --git a/test/simple/test-cluster-listening-port.js b/test/sequential/test-cluster-listening-port.js
index 352c4d757e..352c4d757e 100644
--- a/test/simple/test-cluster-listening-port.js
+++ b/test/sequential/test-cluster-listening-port.js
diff --git a/test/simple/test-debug-args.js b/test/sequential/test-debug-args.js
index 51eaa801d8..51eaa801d8 100644
--- a/test/simple/test-debug-args.js
+++ b/test/sequential/test-debug-args.js
diff --git a/test/simple/test-debug-cluster.js b/test/sequential/test-debug-cluster.js
index c0963c35a9..c0963c35a9 100644
--- a/test/simple/test-debug-cluster.js
+++ b/test/sequential/test-debug-cluster.js
diff --git a/test/simple/test-debug-port-cluster.js b/test/sequential/test-debug-port-cluster.js
index 34ae3a0293..34ae3a0293 100644
--- a/test/simple/test-debug-port-cluster.js
+++ b/test/sequential/test-debug-port-cluster.js
diff --git a/test/simple/test-debug-port-from-cmdline.js b/test/sequential/test-debug-port-from-cmdline.js
index db0f1b382e..db0f1b382e 100644
--- a/test/simple/test-debug-port-from-cmdline.js
+++ b/test/sequential/test-debug-port-from-cmdline.js
diff --git a/test/simple/test-debug-signal-cluster.js b/test/sequential/test-debug-signal-cluster.js
index cd57e548a9..cd57e548a9 100644
--- a/test/simple/test-debug-signal-cluster.js
+++ b/test/sequential/test-debug-signal-cluster.js
diff --git a/test/simple/test-deprecation-flags.js b/test/sequential/test-deprecation-flags.js
index 3d50c097f6..3d50c097f6 100644
--- a/test/simple/test-deprecation-flags.js
+++ b/test/sequential/test-deprecation-flags.js
diff --git a/test/simple/test-force-repl.js b/test/sequential/test-force-repl.js
index 60ba3485bb..60ba3485bb 100644
--- a/test/simple/test-force-repl.js
+++ b/test/sequential/test-force-repl.js
diff --git a/test/simple/test-fs-watch-recursive.js b/test/sequential/test-fs-watch-recursive.js
index e421ab0222..e421ab0222 100644
--- a/test/simple/test-fs-watch-recursive.js
+++ b/test/sequential/test-fs-watch-recursive.js
diff --git a/test/simple/test-fs-watch.js b/test/sequential/test-fs-watch.js
index 470736d594..470736d594 100644
--- a/test/simple/test-fs-watch.js
+++ b/test/sequential/test-fs-watch.js
diff --git a/test/simple/test-http-pipeline-flood.js b/test/sequential/test-http-pipeline-flood.js
index 64c56dbf34..64c56dbf34 100644
--- a/test/simple/test-http-pipeline-flood.js
+++ b/test/sequential/test-http-pipeline-flood.js
diff --git a/test/simple/test-init.js b/test/sequential/test-init.js
index 139df7f58b..139df7f58b 100644
--- a/test/simple/test-init.js
+++ b/test/sequential/test-init.js
diff --git a/test/simple/test-memory-usage-emfile.js b/test/sequential/test-memory-usage-emfile.js
index aaed899530..aaed899530 100644
--- a/test/simple/test-memory-usage-emfile.js
+++ b/test/sequential/test-memory-usage-emfile.js
diff --git a/test/simple/test-mkdir-rmdir.js b/test/sequential/test-mkdir-rmdir.js
index 73534555c8..73534555c8 100644
--- a/test/simple/test-mkdir-rmdir.js
+++ b/test/sequential/test-mkdir-rmdir.js
diff --git a/test/simple/test-module-loading.js b/test/sequential/test-module-loading.js
index 8687c3b986..c923d56fd4 100644
--- a/test/simple/test-module-loading.js
+++ b/test/sequential/test-module-loading.js
@@ -110,7 +110,7 @@ require('../fixtures/node_modules/foo');
 
 common.debug('test name clashes');
 // this one exists and should import the local module
-var my_path = require('./path');
+var my_path = require('../fixtures/path');
 assert.ok(common.indirectInstanceOf(my_path.path_func, Function));
 // this one does not exist and should throw
 assert.throws(function() { require('./utils')});
@@ -246,7 +246,7 @@ assert.deepEqual(children, {
       'fixtures/node_modules/baz/node_modules/asdf.js': {}
     }
   },
-  'simple/path.js': {},
+  'fixtures/path.js': {},
   'fixtures/throws_error.js': {},
   'fixtures/registerExt.test': {},
   'fixtures/registerExt.hello.world': {},
diff --git a/test/simple/test-net-GH-5504.js b/test/sequential/test-net-GH-5504.js
index 0e87c8210e..0e87c8210e 100644
--- a/test/simple/test-net-GH-5504.js
+++ b/test/sequential/test-net-GH-5504.js
diff --git a/test/simple/test-net-listen-exclusive-random-ports.js b/test/sequential/test-net-listen-exclusive-random-ports.js
index 2c0aa49044..2c0aa49044 100644
--- a/test/simple/test-net-listen-exclusive-random-ports.js
+++ b/test/sequential/test-net-listen-exclusive-random-ports.js
diff --git a/test/simple/test-net-localport.js b/test/sequential/test-net-localport.js
index 34fa377dc8..34fa377dc8 100644
--- a/test/simple/test-net-localport.js
+++ b/test/sequential/test-net-localport.js
diff --git a/test/simple/test-net-server-address.js b/test/sequential/test-net-server-address.js
index cc8fbd211a..cc8fbd211a 100644
--- a/test/simple/test-net-server-address.js
+++ b/test/sequential/test-net-server-address.js
diff --git a/test/simple/test-net-server-bind.js b/test/sequential/test-net-server-bind.js
index 0951aa2462..0951aa2462 100644
--- a/test/simple/test-net-server-bind.js
+++ b/test/sequential/test-net-server-bind.js
diff --git a/test/simple/test-next-tick-error-spin.js b/test/sequential/test-next-tick-error-spin.js
index e0d47a2147..e0d47a2147 100644
--- a/test/simple/test-next-tick-error-spin.js
+++ b/test/sequential/test-next-tick-error-spin.js
diff --git a/test/simple/test-pipe-address.js b/test/sequential/test-pipe-address.js
index 6b29d2a2c4..6b29d2a2c4 100644
--- a/test/simple/test-pipe-address.js
+++ b/test/sequential/test-pipe-address.js
diff --git a/test/simple/test-pipe-head.js b/test/sequential/test-pipe-head.js
index a049be6c29..a049be6c29 100644
--- a/test/simple/test-pipe-head.js
+++ b/test/sequential/test-pipe-head.js
diff --git a/test/simple/test-pipe-stream.js b/test/sequential/test-pipe-stream.js
index b2b2a55184..b2b2a55184 100644
--- a/test/simple/test-pipe-stream.js
+++ b/test/sequential/test-pipe-stream.js
diff --git a/test/simple/test-pipe-unref.js b/test/sequential/test-pipe-unref.js
index 9f715a9d17..9f715a9d17 100644
--- a/test/simple/test-pipe-unref.js
+++ b/test/sequential/test-pipe-unref.js
diff --git a/test/simple/test-pipe.js b/test/sequential/test-pipe.js
index 9f1dae885b..9f1dae885b 100644
--- a/test/simple/test-pipe.js
+++ b/test/sequential/test-pipe.js
diff --git a/test/simple/test-pump-file2tcp-noexist.js b/test/sequential/test-pump-file2tcp-noexist.js
index 8017db73f1..8017db73f1 100644
--- a/test/simple/test-pump-file2tcp-noexist.js
+++ b/test/sequential/test-pump-file2tcp-noexist.js
diff --git a/test/simple/test-pump-file2tcp.js b/test/sequential/test-pump-file2tcp.js
index 60c0fdd7f0..60c0fdd7f0 100644
--- a/test/simple/test-pump-file2tcp.js
+++ b/test/sequential/test-pump-file2tcp.js
diff --git a/test/simple/test-readdir.js b/test/sequential/test-readdir.js
index 24997241f9..24997241f9 100644
--- a/test/simple/test-readdir.js
+++ b/test/sequential/test-readdir.js
diff --git a/test/simple/test-regress-GH-1531.js b/test/sequential/test-regress-GH-1531.js
index 53bc2a3ca1..53bc2a3ca1 100644
--- a/test/simple/test-regress-GH-1531.js
+++ b/test/sequential/test-regress-GH-1531.js
diff --git a/test/simple/test-regress-GH-1697.js b/test/sequential/test-regress-GH-1697.js
index fdf2c42e9e..fdf2c42e9e 100644
--- a/test/simple/test-regress-GH-1697.js
+++ b/test/sequential/test-regress-GH-1697.js
diff --git a/test/simple/test-regress-GH-1726.js b/test/sequential/test-regress-GH-1726.js
index f65e63d10b..f65e63d10b 100644
--- a/test/simple/test-regress-GH-1726.js
+++ b/test/sequential/test-regress-GH-1726.js
diff --git a/test/simple/test-regress-GH-1899.js b/test/sequential/test-regress-GH-1899.js
index 7fc8007a24..7fc8007a24 100644
--- a/test/simple/test-regress-GH-1899.js
+++ b/test/sequential/test-regress-GH-1899.js
diff --git a/test/simple/test-regress-GH-3542.js b/test/sequential/test-regress-GH-3542.js
index 90e0b78501..90e0b78501 100644
--- a/test/simple/test-regress-GH-3542.js
+++ b/test/sequential/test-regress-GH-3542.js
diff --git a/test/simple/test-regress-GH-3739.js b/test/sequential/test-regress-GH-3739.js
index 937068795a..937068795a 100644
--- a/test/simple/test-regress-GH-3739.js
+++ b/test/sequential/test-regress-GH-3739.js
diff --git a/test/simple/test-regress-GH-4015.js b/test/sequential/test-regress-GH-4015.js
index b66584f804..b66584f804 100644
--- a/test/simple/test-regress-GH-4015.js
+++ b/test/sequential/test-regress-GH-4015.js
diff --git a/test/simple/test-regress-GH-4027.js b/test/sequential/test-regress-GH-4027.js
index 3dff1684d7..3dff1684d7 100644
--- a/test/simple/test-regress-GH-4027.js
+++ b/test/sequential/test-regress-GH-4027.js
diff --git a/test/simple/test-regress-GH-4948.js b/test/sequential/test-regress-GH-4948.js
index 5e717fad56..5e717fad56 100644
--- a/test/simple/test-regress-GH-4948.js
+++ b/test/sequential/test-regress-GH-4948.js
diff --git a/test/simple/test-regress-GH-746.js b/test/sequential/test-regress-GH-746.js
index 29f1456522..29f1456522 100644
--- a/test/simple/test-regress-GH-746.js
+++ b/test/sequential/test-regress-GH-746.js
diff --git a/test/simple/test-regress-GH-784.js b/test/sequential/test-regress-GH-784.js
index c2039a9c6a..c2039a9c6a 100644
--- a/test/simple/test-regress-GH-784.js
+++ b/test/sequential/test-regress-GH-784.js
diff --git a/test/simple/test-regress-GH-819.js b/test/sequential/test-regress-GH-819.js
index 874d99e285..874d99e285 100644
--- a/test/simple/test-regress-GH-819.js
+++ b/test/sequential/test-regress-GH-819.js
diff --git a/test/simple/test-regress-GH-877.js b/test/sequential/test-regress-GH-877.js
index 30e1f8009e..30e1f8009e 100644
--- a/test/simple/test-regress-GH-877.js
+++ b/test/sequential/test-regress-GH-877.js
diff --git a/test/simple/test-require-cache-without-stat.js b/test/sequential/test-require-cache-without-stat.js
index c2c6c06552..c2c6c06552 100644
--- a/test/simple/test-require-cache-without-stat.js
+++ b/test/sequential/test-require-cache-without-stat.js
diff --git a/test/simple/test-setproctitle.js b/test/sequential/test-setproctitle.js
index 6373af4cd1..6373af4cd1 100644
--- a/test/simple/test-setproctitle.js
+++ b/test/sequential/test-setproctitle.js
diff --git a/test/simple/test-sigint-infinite-loop.js b/test/sequential/test-sigint-infinite-loop.js
index 4ff2745845..4ff2745845 100644
--- a/test/simple/test-sigint-infinite-loop.js
+++ b/test/sequential/test-sigint-infinite-loop.js
diff --git a/test/simple/test-signal-unregister.js b/test/sequential/test-signal-unregister.js
index d65e0a0d98..d65e0a0d98 100644
--- a/test/simple/test-signal-unregister.js
+++ b/test/sequential/test-signal-unregister.js
diff --git a/test/simple/test-socket-write-after-fin-error.js b/test/sequential/test-socket-write-after-fin-error.js
index 123557417c..123557417c 100644
--- a/test/simple/test-socket-write-after-fin-error.js
+++ b/test/sequential/test-socket-write-after-fin-error.js
diff --git a/test/simple/test-socket-write-after-fin.js b/test/sequential/test-socket-write-after-fin.js
index 88d780b81e..88d780b81e 100644
--- a/test/simple/test-socket-write-after-fin.js
+++ b/test/sequential/test-socket-write-after-fin.js
diff --git a/test/simple/test-stdin-child-proc.js b/test/sequential/test-stdin-child-proc.js
index 6a4ea94739..6a4ea94739 100644
--- a/test/simple/test-stdin-child-proc.js
+++ b/test/sequential/test-stdin-child-proc.js
diff --git a/test/simple/test-stdin-from-file.js b/test/sequential/test-stdin-from-file.js
index 617b9037d2..617b9037d2 100644
--- a/test/simple/test-stdin-from-file.js
+++ b/test/sequential/test-stdin-from-file.js
diff --git a/test/simple/test-stdin-pipe-resume.js b/test/sequential/test-stdin-pipe-resume.js
index 163d8369c9..163d8369c9 100644
--- a/test/simple/test-stdin-pipe-resume.js
+++ b/test/sequential/test-stdin-pipe-resume.js
diff --git a/test/simple/test-stdin-script-child.js b/test/sequential/test-stdin-script-child.js
index e940c3c3f3..e940c3c3f3 100644
--- a/test/simple/test-stdin-script-child.js
+++ b/test/sequential/test-stdin-script-child.js
diff --git a/test/simple/test-stdout-cannot-be-closed-child-process-pipe.js b/test/sequential/test-stdout-cannot-be-closed-child-process-pipe.js
index 2e79c5af10..2e79c5af10 100644
--- a/test/simple/test-stdout-cannot-be-closed-child-process-pipe.js
+++ b/test/sequential/test-stdout-cannot-be-closed-child-process-pipe.js
diff --git a/test/simple/test-stdout-close-catch.js b/test/sequential/test-stdout-close-catch.js
index f517a6cbe4..f517a6cbe4 100644
--- a/test/simple/test-stdout-close-catch.js
+++ b/test/sequential/test-stdout-close-catch.js
diff --git a/test/simple/test-stdout-stderr-reading.js b/test/sequential/test-stdout-stderr-reading.js
index 5b67a0d061..5b67a0d061 100644
--- a/test/simple/test-stdout-stderr-reading.js
+++ b/test/sequential/test-stdout-stderr-reading.js
diff --git a/test/simple/test-stdout-to-file.js b/test/sequential/test-stdout-to-file.js
index 94181ef817..94181ef817 100644
--- a/test/simple/test-stdout-to-file.js
+++ b/test/sequential/test-stdout-to-file.js
diff --git a/test/simple/test-stream2-fs.js b/test/sequential/test-stream2-fs.js
index e162406287..e162406287 100644
--- a/test/simple/test-stream2-fs.js
+++ b/test/sequential/test-stream2-fs.js
diff --git a/test/simple/test-stream2-httpclient-response-end.js b/test/sequential/test-stream2-httpclient-response-end.js
index 15cffc2ac9..15cffc2ac9 100644
--- a/test/simple/test-stream2-httpclient-response-end.js
+++ b/test/sequential/test-stream2-httpclient-response-end.js
diff --git a/test/simple/test-stream2-stderr-sync.js b/test/sequential/test-stream2-stderr-sync.js
index 9e2d3ec223..9e2d3ec223 100644
--- a/test/simple/test-stream2-stderr-sync.js
+++ b/test/sequential/test-stream2-stderr-sync.js
diff --git a/test/simple/test-sync-fileread.js b/test/sequential/test-sync-fileread.js
index 428838a8cd..428838a8cd 100644
--- a/test/simple/test-sync-fileread.js
+++ b/test/sequential/test-sync-fileread.js
diff --git a/test/simple/test-tcp-wrap-connect.js b/test/sequential/test-tcp-wrap-connect.js
index 9e915d243b..9e915d243b 100644
--- a/test/simple/test-tcp-wrap-connect.js
+++ b/test/sequential/test-tcp-wrap-connect.js
diff --git a/test/simple/test-tcp-wrap-listen.js b/test/sequential/test-tcp-wrap-listen.js
index 5801368ba1..5801368ba1 100644
--- a/test/simple/test-tcp-wrap-listen.js
+++ b/test/sequential/test-tcp-wrap-listen.js
diff --git a/test/simple/test-tls-honorcipherorder.js b/test/sequential/test-tls-honorcipherorder.js
index 6b24d75146..6b24d75146 100644
--- a/test/simple/test-tls-honorcipherorder.js
+++ b/test/sequential/test-tls-honorcipherorder.js
diff --git a/test/simple/test-util-debug.js b/test/sequential/test-util-debug.js
index 6d9c28a95a..6d9c28a95a 100644
--- a/test/simple/test-util-debug.js
+++ b/test/sequential/test-util-debug.js
diff --git a/test/simple/test-vm-syntax-error-stderr.js b/test/sequential/test-vm-syntax-error-stderr.js
index 3e88e1ff10..3e88e1ff10 100644
--- a/test/simple/test-vm-syntax-error-stderr.js
+++ b/test/sequential/test-vm-syntax-error-stderr.js
diff --git a/test/simple/test-vm-timeout-rethrow.js b/test/sequential/test-vm-timeout-rethrow.js
index c2158a1350..c2158a1350 100644
--- a/test/simple/test-vm-timeout-rethrow.js
+++ b/test/sequential/test-vm-timeout-rethrow.js
diff --git a/test/simple/test-zerolengthbufferbug.js b/test/sequential/test-zerolengthbufferbug.js
index 395e35baf5..395e35baf5 100644
--- a/test/simple/test-zerolengthbufferbug.js
+++ b/test/sequential/test-zerolengthbufferbug.js
diff --git a/test/sequential/testcfg.py b/test/sequential/testcfg.py
new file mode 100644
index 0000000000..b1fce18100
--- /dev/null
+++ b/test/sequential/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, 'sequential')
diff --git a/test/simple/net-socket-readystate.js b/test/simple/net-socket-readystate.js
deleted file mode 100644
index 107d68e951..0000000000
--- a/test/simple/net-socket-readystate.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// 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 net = require('net');
-var assert = require('assert');
-
-var sock = new net.Socket();
-
-var server = net.createServer().listen(common.PORT, function() {
-  assert(!sock.readable);
-  assert(!sock.writable);
-  assert.equal(sock.readyState, 'closed');
-
-  sock.connect(common.PORT, function() {
-    assert.equal(sock.readable, true);
-    assert.equal(sock.writable, true);
-    assert.equal(sock.readyState, 'open');
-
-    sock.end();
-    assert(!sock.writable);
-    assert.equal(sock.readyState, 'readOnly');
-
-    server.close();
-    sock.on('close', function() {
-      assert(!sock.readable);
-      assert(!sock.writable);
-      assert.equal(sock.readyState, 'closed');
-    });
-  });
-
-  assert.equal(sock.readyState, 'opening');
-});
diff --git a/tools/test.py b/tools/test.py
index 94792e2aff..cb60fbda1e 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1317,7 +1317,8 @@ def GetSpecialCommandProcessor(value):
 
 
 BUILT_IN_TESTS = [
-  'simple',
+  'sequential',
+  'parallel',
   'pummel',
   'message',
   'internet',
diff --git a/vcbuild.bat b/vcbuild.bat
index 90cfc54693..ab46819eb2 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -163,10 +163,10 @@ if "%test%"=="" goto exit
 if "%config%"=="Debug" set test_args=--mode=debug
 if "%config%"=="Release" set test_args=--mode=release
 
-if "%test%"=="test" set test_args=%test_args% simple message
+if "%test%"=="test" set test_args=%test_args% sequential parallel message
 if "%test%"=="test-internet" set test_args=%test_args% internet
 if "%test%"=="test-pummel" set test_args=%test_args% pummel
-if "%test%"=="test-simple" set test_args=%test_args% simple
+if "%test%"=="test-simple" set test_args=%test_args% sequential parallel
 if "%test%"=="test-message" set test_args=%test_args% message
 if "%test%"=="test-gc" set test_args=%test_args% gc
 if "%test%"=="test-all" set test_args=%test_args%