diff --git a/package.json b/package.json
index f191736a4..8dd63de1f 100644
--- a/package.json
+++ b/package.json
@@ -12,11 +12,10 @@
     "url": "https://github.com/marko-js/marko.git"
   },
   "scripts": {
-    "init-tests": "./test/init-tests.sh",
-    "test": "npm run init-tests && node_modules/.bin/mocha --ui bdd --reporter spec ./test && node_modules/.bin/jshint compiler/ runtime/ taglibs/",
-    "test-fast": "npm run init-tests && node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-test",
-    "test-async": "npm run init-tests && node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-async-test",
-    "test-taglib-loader": "npm run init-tests && node_modules/.bin/mocha --ui bdd --reporter spec ./test/taglib-loader-test",
+    "test": "node_modules/.bin/mocha --ui bdd --reporter spec ./test && node_modules/.bin/jshint compiler/ runtime/ taglibs/",
+    "test-fast": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-test",
+    "test-async": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-async-test",
+    "test-taglib-loader": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/taglib-loader-test",
     "jshint": "node_modules/.bin/jshint compiler/ runtime/ taglibs/"
   },
   "author": "Patrick Steele-Idem <pnidem@gmail.com>",
diff --git a/test/adjustIndent-test.js b/test/adjustIndent-test.js
index 2576bfb17..53a92fc80 100644
--- a/test/adjustIndent-test.js
+++ b/test/adjustIndent-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var path = require('path');
diff --git a/test/api-tests.js b/test/api-tests.js
index f4e91c60b..38feb1eb0 100644
--- a/test/api-tests.js
+++ b/test/api-tests.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var expect = require('chai').expect;
diff --git a/test/async-render-test.js b/test/async-render-test.js
index 7eb52638f..2c14f3d27 100644
--- a/test/async-render-test.js
+++ b/test/async-render-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var path = require('path');
diff --git a/test/codegen-test.js b/test/codegen-test.js
index 3ef23f633..f1e4a2cf5 100644
--- a/test/codegen-test.js
+++ b/test/codegen-test.js
@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;
diff --git a/test/compiler-test.js b/test/compiler-test.js
index 67f213d1b..1dbfee5c9 100644
--- a/test/compiler-test.js
+++ b/test/compiler-test.js
@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;
diff --git a/test/expression-toString-test.js b/test/expression-toString-test.js
index 525eb14de..0d5d66b8b 100644
--- a/test/expression-toString-test.js
+++ b/test/expression-toString-test.js
@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;
diff --git a/test/hot-reload-test.js b/test/hot-reload-test.js
index 3dab8f051..a8020fcdf 100644
--- a/test/hot-reload-test.js
+++ b/test/hot-reload-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var expect = require('chai').expect;
diff --git a/test/init-tests.sh b/test/init-tests.sh
deleted file mode 100755
index 045972361..000000000
--- a/test/init-tests.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DIR=`dirname $0`
-
-cd ${DIR}
-
-if [ ! -L "./node_modules/marko" ]; then
-    mkdir -p node_modules
-    ln -s ../../ node_modules/marko
-fi
diff --git a/test/parseExpression-test.js b/test/parseExpression-test.js
index 9f692b1e5..75440d00a 100644
--- a/test/parseExpression-test.js
+++ b/test/parseExpression-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var autotest = require('./autotest');
diff --git a/test/parseFor-test.js b/test/parseFor-test.js
index 2ada99398..797ac043b 100644
--- a/test/parseFor-test.js
+++ b/test/parseFor-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var parseFor = require('../taglibs/core/util/parseFor.js');
diff --git a/test/parseJavaScriptArgs-test.js b/test/parseJavaScriptArgs-test.js
index 9eccea9f2..3c238d3cc 100644
--- a/test/parseJavaScriptArgs-test.js
+++ b/test/parseJavaScriptArgs-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var compiler = require('../compiler');
diff --git a/test/parser-test.js b/test/parser-test.js
index 85d4d58d6..f112e1cc0 100644
--- a/test/parser-test.js
+++ b/test/parser-test.js
@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;
diff --git a/test/patch-module.js b/test/patch-module.js
new file mode 100644
index 000000000..fe2d5a294
--- /dev/null
+++ b/test/patch-module.js
@@ -0,0 +1,13 @@
+var nodePath = require('path');
+
+var Module = require('module').Module;
+var oldResolveFilename = Module._resolveFilename;
+
+var rootDir = nodePath.join(__dirname, '../');
+Module._resolveFilename = function(request, parent, isMain) {
+    if (request.startsWith('marko')) {
+        request = request.substring('marko'.length);
+        request = rootDir + request;
+    }
+    return oldResolveFilename.call(this, request, parent, isMain);
+};
\ No newline at end of file
diff --git a/test/pretty-print-test.js b/test/pretty-print-test.js
index 92c031581..045008b79 100644
--- a/test/pretty-print-test.js
+++ b/test/pretty-print-test.js
@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;
diff --git a/test/render-test.js b/test/render-test.js
index 3fd2722c9..ce83a6c5d 100644
--- a/test/render-test.js
+++ b/test/render-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 var path = require('path');
diff --git a/test/taglib-finder-test.js b/test/taglib-finder-test.js
index 1e30d54f0..403ea3efc 100644
--- a/test/taglib-finder-test.js
+++ b/test/taglib-finder-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 require('chai').should();
diff --git a/test/taglib-loader-test.js b/test/taglib-loader-test.js
index d875a57ec..c4f6efd34 100644
--- a/test/taglib-loader-test.js
+++ b/test/taglib-loader-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 require('chai').should();
diff --git a/test/taglib-lookup-test.js b/test/taglib-lookup-test.js
index dd696b82d..58dc7eba8 100644
--- a/test/taglib-lookup-test.js
+++ b/test/taglib-lookup-test.js
@@ -1,4 +1,6 @@
 'use strict';
+require('./patch-module');
+
 var chai = require('chai');
 chai.config.includeStack = true;
 require('chai').should();
diff --git a/test/walker-test.js b/test/walker-test.js
index 8c6e213dc..331d006bc 100644
--- a/test/walker-test.js
+++ b/test/walker-test.js
@@ -1,4 +1,5 @@
 'use strict';
+require('./patch-module');
 
 var chai = require('chai');
 chai.config.includeStack = true;