diff --git a/tests/Gruntfile.js b/Gruntfile-test.js
similarity index 65%
rename from tests/Gruntfile.js
rename to Gruntfile-test.js
index cde7ce64..39af0c03 100644
--- a/tests/Gruntfile.js
+++ b/Gruntfile-test.js
@@ -4,11 +4,12 @@ var fs = require('fs');
 
 // Create a mock-fs module that can load our gzipped test cases
 var data = {};
-fs.readdirSync('tests').forEach(function(filename) {
-    filename = 'tests/' + filename;
+fs.readdirSync('tests/tests').forEach(function(filename) {
+    if (!filename.match(/\.json\.gz$/)) { return; }
+    filename = 'tests/tests/' + filename;
     data['/' + filename] = fs.readFileSync(filename).toString('base64');
 });
-fs.writeFileSync('./dist/tests.json', JSON.stringify(data));
+fs.writeFileSync('./tests/dist/tests.json', JSON.stringify(data));
 
 
 module.exports = function(grunt) {
@@ -16,7 +17,7 @@ module.exports = function(grunt) {
     browserify: {
       dist: {
         files: {
-            'dist/tests.js': './browser.js',
+            'tests/dist/tests.js': './tests/browser.js',
         },
         options: {
           browserifyOptions: {
diff --git a/package.json b/package.json
index e7f7f654..fde81f68 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "test": "if [ \"$RUN_PHANTOMJS\" = \"1\" ]; then npm run-script test-phantomjs; else npm run-script test-node; fi",
     "test-node": "./node_modules/.bin/mocha tests/test-*.js",
-    "test-phantomjs": "./node_modules/.bin/grunt --gruntfile tests/Gruntfile.js dist && phantomjs --web-security=false ./node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js ./tests/test.html",
+    "test-phantomjs": "./node_modules/.bin/grunt --gruntfile Gruntfile-test.js dist && phantomjs --web-security=false ./node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js ./tests/test.html",
     "version": "grunt dist"
   },
   "dependencies": {
@@ -22,6 +22,7 @@
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
+    "browserify-zlib": "^0.2.0",
     "grunt": "^0.4.5",
     "grunt-browserify": "^5.0.0",
     "grunt-cli": "1.2.0",
@@ -32,6 +33,8 @@
     "web3": "0.20.2"
   },
   "browser": {
+    "fs": "./tests/browser-fs.js",
+    "zlib": "browserify-zlib",
     "./utils/random-bytes.js": "./utils/browser-random-bytes.js",
     "xmlhttprequest": "./providers/browser-xmlhttprequest.js"
   },