diff --git a/index.js b/index.js
index 99c19aa13..2ce366c10 100644
--- a/index.js
+++ b/index.js
@@ -10,18 +10,8 @@ module.exports = {
     trieanyorder: require('./TrieTests/trieanyorder')
   },
   txtest: require('./BasicTests/txtest'),
-  StateTests: {
-    stExample: require('./StateTests/stExample.json'),
-    stInitCodeTest: require('./StateTests/stInitCodeTest.json'),
-    stLogTests: require('./StateTests/stLogTests.json'),
-    stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'),
-    stRecursiveCreate: require('./StateTests/stRecursiveCreate'),
-    stRefundTest: require('./StateTests/stRefundTest'),
-    stSpecial: require('./StateTests/stSpecialTest'),
-    stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'),
-    stTransactionTest: require('./StateTests/stTransactionTest')
-  },
-  VMTests: {
+  stateTests: require('require-all')(__dirname + '/StateTests/'),
+  vmTests: {
     vmRandom: require('./VMTests/RandomTests/randomTest'),
     vmArithmeticTest: require('./VMTests/vmArithmeticTest'),
     vmBitwiseLogicOperationTest: require('./VMTests/vmBitwiseLogicOperationTest'),
diff --git a/package.json b/package.json
index eb0841450..c066bd1b5 100644
--- a/package.json
+++ b/package.json
@@ -19,5 +19,8 @@
   "bugs": {
     "url": "https://github.com/ethereum/tests/issues"
   },
-  "homepage": "https://github.com/ethereum/tests"
+  "homepage": "https://github.com/ethereum/tests",
+  "dependencies": {
+    "require-all": "^1.0.0"
+  }
 }