diff --git a/test/disabled/GH-670.js b/test/disabled/GH-670.js
index e717e3fd2e..746d8d1794 100644
--- a/test/disabled/GH-670.js
+++ b/test/disabled/GH-670.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 var assert = require('assert');
 var https = require('https');
 var tls = require('tls');
diff --git a/test/disabled/test-child-process-uid-gid.js b/test/disabled/test-child-process-uid-gid.js
index bce0a20aa5..41c2169d9a 100644
--- a/test/disabled/test-child-process-uid-gid.js
+++ b/test/disabled/test-child-process-uid-gid.js
@@ -22,6 +22,7 @@
 
 
 
+var common = require('../common');
 var assert = require('assert');
 var spawn = require('child_process').spawn;
 var fs = require('fs');
diff --git a/test/disabled/test-http-default-port.js b/test/disabled/test-http-default-port.js
index 58f89fee5f..ec7f69fc64 100644
--- a/test/disabled/test-http-default-port.js
+++ b/test/disabled/test-http-default-port.js
@@ -24,6 +24,7 @@
 
 // This must be run as root.
 
+var common = require('../common');
 var http = require('http'),
     https = require('https'),
     PORT = 80,
diff --git a/test/disabled/test-https-loop-to-google.js b/test/disabled/test-https-loop-to-google.js
index 0495e9915c..112902b1f7 100644
--- a/test/disabled/test-https-loop-to-google.js
+++ b/test/disabled/test-https-loop-to-google.js
@@ -28,6 +28,7 @@
 // Tested on node 0.5.0-pre commit 9851574
 
 
+var common = require('../common');
 var https = require('https');
 
 for (var i = 0; i < 10; ++i)
diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js
index 9da388cb54..e0d5486c8f 100644
--- a/test/internet/test-dns.js
+++ b/test/internet/test-dns.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 var assert = require('assert'),
     dns = require('dns'),
     net = require('net'),
diff --git a/test/pummel/test-net-timeout2.js b/test/pummel/test-net-timeout2.js
index 16f69cc022..5f9c03ee54 100644
--- a/test/pummel/test-net-timeout2.js
+++ b/test/pummel/test-net-timeout2.js
@@ -22,6 +22,7 @@
 // socket.write was not resetting the timeout timer. See
 // https://github.com/joyent/node/issues/2002
 
+var common = require('../common');
 var assert = require('assert');
 var net = require('net');
 
diff --git a/test/pummel/test-process-uptime.js b/test/pummel/test-process-uptime.js
index 1429d379f2..602f7775db 100644
--- a/test/pummel/test-process-uptime.js
+++ b/test/pummel/test-process-uptime.js
@@ -22,6 +22,7 @@
 
 
 
+var common = require('../common');
 var assert = require('assert');
 
 console.error(process.uptime());
diff --git a/test/simple/path.js b/test/simple/path.js
index c955bbab41..21c08d3c6b 100644
--- a/test/simple/path.js
+++ b/test/simple/path.js
@@ -23,6 +23,7 @@
 
 
 // This is actually more a fixture than a test. It is used to make
+var common = require('../common');
 // sure that require('./path') and require('path') do different things.
 // It has to be in the same directory as the test 'test-module-loading.js'
 // and it has to have the same name as an internal module.
diff --git a/test/simple/test-child-process-double-pipe.js b/test/simple/test-child-process-double-pipe.js
index a2253666e9..84fbf4fb20 100644
--- a/test/simple/test-child-process-double-pipe.js
+++ b/test/simple/test-child-process-double-pipe.js
@@ -21,6 +21,7 @@
 
 var is_windows = process.platform === 'win32';
 
+var common = require('../common');
 var assert = require('assert'),
     util = require('util'),
     spawn = require('child_process').spawn;
diff --git a/test/simple/test-eio-limit.js b/test/simple/test-eio-limit.js
index 78128647fe..15f0bd03b2 100644
--- a/test/simple/test-eio-limit.js
+++ b/test/simple/test-eio-limit.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 var assert = require('assert'),
     zlib = require('zlib'),
     started = 0,
diff --git a/test/simple/test-event-emitter-check-listener-leaks.js b/test/simple/test-event-emitter-check-listener-leaks.js
index 9b9ad867a2..7d9c203243 100644
--- a/test/simple/test-event-emitter-check-listener-leaks.js
+++ b/test/simple/test-event-emitter-check-listener-leaks.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 var assert = require('assert');
 var events = require('events');
 
diff --git a/test/simple/test-fs-exists.js b/test/simple/test-fs-exists.js
index bdc81473c6..3775730569 100644
--- a/test/simple/test-fs-exists.js
+++ b/test/simple/test-fs-exists.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 var assert = require('assert');
 var fs = require('fs');
 var f = __filename;
diff --git a/test/simple/test-http-parser-bad-ref.js b/test/simple/test-http-parser-bad-ref.js
index 43fad11b16..4a9c70515b 100644
--- a/test/simple/test-http-parser-bad-ref.js
+++ b/test/simple/test-http-parser-bad-ref.js
@@ -3,6 +3,7 @@
 
 // Flags: --expose_gc
 
+var common = require('../common');
 var assert = require('assert');
 var HTTPParser = process.binding('http_parser').HTTPParser;
 
diff --git a/test/simple/test-net-dns-error.js b/test/simple/test-net-dns-error.js
index 67d1fc6846..10857a9af0 100644
--- a/test/simple/test-net-dns-error.js
+++ b/test/simple/test-net-dns-error.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 var assert = require('assert');
 
 var net = require('net');
diff --git a/test/simple/test-pipe-return-val.js b/test/simple/test-pipe-return-val.js
index a0a9fa772d..274e9f5bc6 100644
--- a/test/simple/test-pipe-return-val.js
+++ b/test/simple/test-pipe-return-val.js
@@ -24,6 +24,7 @@
 
 // This test ensures SourceStream.pipe(DestStream) returns DestStream
 
+var common = require('../common');
 var Stream = require('stream').Stream;
 var assert = require('assert');
 var util = require('util');
diff --git a/test/simple/test-process-env.js b/test/simple/test-process-env.js
index fb4a35b63d..fdf35ba772 100644
--- a/test/simple/test-process-env.js
+++ b/test/simple/test-process-env.js
@@ -22,8 +22,9 @@
 // first things first, set the timezone; see tzset(3)
 process.env.TZ = 'Europe/Amsterdam';
 
-assert = require('assert');
-spawn = require('child_process').spawn;
+var common = require('../common');
+var assert = require('assert');
+var spawn = require('child_process').spawn;
 
 /* For the moment we are not going to support setting the timezone via the
  * environment variables. The problem is that various V8 platform backends
@@ -57,7 +58,7 @@ if (process.argv[2] == 'you-are-the-child') {
   delete process.env.NODE_PROCESS_ENV_DELETED;
   assert.equal(false, 'NODE_PROCESS_ENV_DELETED' in process.env);
 
-  child = spawn(process.argv[0], [process.argv[1], 'you-are-the-child']);
+  var child = spawn(process.argv[0], [process.argv[1], 'you-are-the-child']);
   child.stdout.on('data', function(data) { console.log(data.toString()); });
   child.stderr.on('data', function(data) { console.log(data.toString()); });
   child.on('exit', function(statusCode) {
diff --git a/test/simple/test-process-exit.js b/test/simple/test-process-exit.js
index 59e9cbd155..fa86d9efec 100644
--- a/test/simple/test-process-exit.js
+++ b/test/simple/test-process-exit.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 var assert = require('assert');
 
 // recursively calling .exit() should not overflow the call stack
diff --git a/test/simple/test-process-kill-null.js b/test/simple/test-process-kill-null.js
index bf096a6442..708e27dff7 100644
--- a/test/simple/test-process-kill-null.js
+++ b/test/simple/test-process-kill-null.js
@@ -20,6 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+var common = require('../common');
 var assert = require('assert');
 var spawn = require('child_process').spawn;
 
diff --git a/test/simple/test-process-next-tick.js b/test/simple/test-process-next-tick.js
index e8706cbfde..0322a033e3 100644
--- a/test/simple/test-process-next-tick.js
+++ b/test/simple/test-process-next-tick.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 var assert = require('assert');
 var N = 2;
 var tickCount = 0;
diff --git a/test/simple/test-punycode.js b/test/simple/test-punycode.js
index 1fd67105d6..f3d6dd7819 100644
--- a/test/simple/test-punycode.js
+++ b/test/simple/test-punycode.js
@@ -39,6 +39,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+var common = require('../common');
 var punycode = require('punycode');
 var assert = require('assert');
 
diff --git a/test/simple/test-readdouble.js b/test/simple/test-readdouble.js
index 3599a3f5fe..9fa23e090e 100644
--- a/test/simple/test-readdouble.js
+++ b/test/simple/test-readdouble.js
@@ -23,6 +23,7 @@
  * Tests to verify we're reading in doubles correctly
  */
 var SlowBuffer = process.binding('buffer').SlowBuffer;
+var common = require('../common');
 var ASSERT = require('assert');
 
 /*
diff --git a/test/simple/test-readfloat.js b/test/simple/test-readfloat.js
index 9bb3529881..373fa20978 100644
--- a/test/simple/test-readfloat.js
+++ b/test/simple/test-readfloat.js
@@ -23,6 +23,7 @@
  * Tests to verify we're reading in floats correctly
  */
 var SlowBuffer = process.binding('buffer').SlowBuffer;
+var common = require('../common');
 var ASSERT = require('assert');
 
 /*
diff --git a/test/simple/test-readint.js b/test/simple/test-readint.js
index 40d4abbb5d..f1bae2d130 100644
--- a/test/simple/test-readint.js
+++ b/test/simple/test-readint.js
@@ -23,6 +23,7 @@
  * Tests to verify we're reading in signed integers correctly
  */
 var SlowBuffer = process.binding('buffer').SlowBuffer;
+var common = require('../common');
 var ASSERT = require('assert');
 
 /*
diff --git a/test/simple/test-readuint.js b/test/simple/test-readuint.js
index d4ad6019fc..e63bba7005 100644
--- a/test/simple/test-readuint.js
+++ b/test/simple/test-readuint.js
@@ -24,6 +24,7 @@
  */
 
 var SlowBuffer = process.binding('buffer').SlowBuffer;
+var common = require('../common');
 var ASSERT = require('assert');
 
 /*
diff --git a/test/simple/test-regress-GH-1697.js b/test/simple/test-regress-GH-1697.js
index a5f8a06184..18790d483a 100644
--- a/test/simple/test-regress-GH-1697.js
+++ b/test/simple/test-regress-GH-1697.js
@@ -19,6 +19,7 @@
 // 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'),
     cp = require('child_process'),
     util = require('util');
diff --git a/test/simple/test-repl-tab-complete.js b/test/simple/test-repl-tab-complete.js
index 59483e2efd..f183b92db8 100644
--- a/test/simple/test-repl-tab-complete.js
+++ b/test/simple/test-repl-tab-complete.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 var assert = require('assert');
 var util = require('util');
 
diff --git a/test/simple/test-setproctitle.js b/test/simple/test-setproctitle.js
index 207c2e3f51..7ae1382330 100644
--- a/test/simple/test-setproctitle.js
+++ b/test/simple/test-setproctitle.js
@@ -27,6 +27,7 @@ if ('linux freebsd'.indexOf(process.platform) === -1) {
   process.exit();
 }
 
+var common = require('../common');
 var assert = require('assert');
 var exec = require('child_process').exec;
 
diff --git a/test/simple/test-stdin-child-proc.js b/test/simple/test-stdin-child-proc.js
index ee23eee36e..6a4ea94739 100644
--- a/test/simple/test-stdin-child-proc.js
+++ b/test/simple/test-stdin-child-proc.js
@@ -21,6 +21,7 @@
 
 // This tests that pausing and resuming stdin does not hang and timeout
 // when done in a child process.  See test/simple/test-stdin-pause-resume.js
+var common = require('../common');
 var child_process = require('child_process');
 var path = require('path');
 child_process.spawn(process.execPath,
diff --git a/test/simple/test-stream-pipe-cleanup.js b/test/simple/test-stream-pipe-cleanup.js
index aa504c4164..5a72a48fb0 100644
--- a/test/simple/test-stream-pipe-cleanup.js
+++ b/test/simple/test-stream-pipe-cleanup.js
@@ -22,6 +22,7 @@
 // This test asserts that Stream.prototype.pipe does not leave listeners
 // hanging on the source or dest.
 
+var common = require('../common');
 var stream = require('stream');
 var assert = require('assert');
 var util = require('util');
diff --git a/test/simple/test-stream-pipe-event.js b/test/simple/test-stream-pipe-event.js
index 7b2fb87b52..cb9d5fe8ca 100644
--- a/test/simple/test-stream-pipe-event.js
+++ b/test/simple/test-stream-pipe-event.js
@@ -19,6 +19,7 @@
 // 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 stream = require('stream');
 var assert = require('assert');
 var util = require('util');
diff --git a/test/simple/test-typed-arrays.js b/test/simple/test-typed-arrays.js
index 6edcba1f81..475f4dbf24 100644
--- a/test/simple/test-typed-arrays.js
+++ b/test/simple/test-typed-arrays.js
@@ -25,6 +25,7 @@
  * verify Buffer can used in Typed Arrays
  */
 
+var common = require('../common');
 var assert = require('assert');
 var SlowBuffer = process.binding('buffer').SlowBuffer;
 var ArrayBuffer = process.binding('typed_array').ArrayBuffer;
diff --git a/test/simple/test-writedouble.js b/test/simple/test-writedouble.js
index 054161ba06..829ba29a73 100644
--- a/test/simple/test-writedouble.js
+++ b/test/simple/test-writedouble.js
@@ -23,6 +23,7 @@
  * Tests to verify we're writing doubles correctly
  */
 var SlowBuffer = process.binding('buffer').SlowBuffer;
+var common = require('../common');
 var ASSERT = require('assert');
 
 function test(clazz) {
diff --git a/test/simple/test-writefloat.js b/test/simple/test-writefloat.js
index 5ec8fe71ab..d10cb7547b 100644
--- a/test/simple/test-writefloat.js
+++ b/test/simple/test-writefloat.js
@@ -23,6 +23,7 @@
  * Tests to verify we're writing floats correctly
  */
 var SlowBuffer = process.binding('buffer').SlowBuffer;
+var common = require('../common');
 var ASSERT = require('assert');
 
 function test(clazz) {
diff --git a/test/simple/test-writeint.js b/test/simple/test-writeint.js
index 9d2161bd11..b7ebd6964f 100644
--- a/test/simple/test-writeint.js
+++ b/test/simple/test-writeint.js
@@ -23,6 +23,7 @@
  * Tests to verify we're writing signed integers correctly
  */
 var SlowBuffer = process.binding('buffer').SlowBuffer;
+var common = require('../common');
 var ASSERT = require('assert');
 
 function test8(clazz) {
diff --git a/test/simple/test-writeuint.js b/test/simple/test-writeuint.js
index 3e38cccc5d..91b5c6c9c6 100644
--- a/test/simple/test-writeuint.js
+++ b/test/simple/test-writeuint.js
@@ -23,6 +23,7 @@
  * A battery of tests to help us read a series of uints
  */
 var SlowBuffer = process.binding('buffer').SlowBuffer;
+var common = require('../common');
 var ASSERT = require('assert');
 
 /*
diff --git a/test/simple/test-zlib-random-byte-pipes.js b/test/simple/test-zlib-random-byte-pipes.js
index 88838c68ca..f9723cc40d 100644
--- a/test/simple/test-zlib-random-byte-pipes.js
+++ b/test/simple/test-zlib-random-byte-pipes.js
@@ -19,6 +19,7 @@
 // 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 crypto = require('crypto');
 var stream = require('stream');
 var Stream = stream.Stream;