diff --git a/.travis.yml b/.travis.yml
index 1db1dff2..2e9c1b2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ node_js:
   - "0.12"
   - iojs
   - "4"
+  - "6"
   - "stable"
 
 script: "npm run travis"
diff --git a/scripts/test-coveralls b/scripts/test-coveralls
index 8cd79f9d..03e4615a 100755
--- a/scripts/test-coveralls
+++ b/scripts/test-coveralls
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 npm run test:compile
-$(npm bin)/istanbul cover $(npm bin)/_mocha -- $(find test-tmp/test -name '*.spec.js') --report lcovonly
+$(npm bin)/istanbul cover $(npm bin)/_mocha -- test-tmp/test/index.spec.js --report lcovonly
 cat ./coverage/lcov.info | $(npm bin)/coveralls
 npm run test:removeTmpDir
\ No newline at end of file
diff --git a/scripts/test-full b/scripts/test-full
index d6bc420d..e7cfc94f 100755
--- a/scripts/test-full
+++ b/scripts/test-full
@@ -2,5 +2,5 @@
 
 npm run test:compile
 node test-tmp/test/dev/test.js
-$(npm bin)/istanbul cover $(npm bin)/_mocha -- $(find test-tmp/test -name '*.spec.js')
+$(npm bin)/istanbul cover $(npm bin)/_mocha -- test-tmp/test/index.spec.js
 npm run test:removeTmpDir
\ No newline at end of file
diff --git a/scripts/test-mocha b/scripts/test-mocha
index 4955e2be..03570593 100755
--- a/scripts/test-mocha
+++ b/scripts/test-mocha
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 npm run test:compile
-$(npm bin)/mocha $(find test-tmp/test -name '*.spec.js')
+$(npm bin)/mocha test-tmp/test/index.spec.js
 npm run test:removeTmpDir
\ No newline at end of file
diff --git a/test/config/config.spec.ts b/test/config/config.spec.ts
deleted file mode 100644
index e4982100..00000000
--- a/test/config/config.spec.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { BabelPolyfill } from '../polyfills/BabelPolyfill';
-
-require('source-map-support').install();
-
-before(() => {
-    BabelPolyfill.append();
-});
diff --git a/test/index.spec.ts b/test/index.spec.ts
new file mode 100644
index 00000000..a2fec126
--- /dev/null
+++ b/test/index.spec.ts
@@ -0,0 +1,24 @@
+import { BabelPolyfill } from './polyfills/BabelPolyfill';
+
+require('source-map-support').install();
+
+BabelPolyfill.append();
+
+/**
+ * Unit tests
+ */
+import './unit-tests/NodeUtils.spec';
+import './unit-tests/ObfuscationResult.spec';
+import './unit-tests/OptionsNormalizer.spec';
+import './unit-tests/Utils.spec';
+import './unit-tests/cli/CLIUtils.spec';
+import './unit-tests/node-obfuscators/CatchClauseObfuscator.spec';
+import './unit-tests/node-obfuscators/FunctionDeclarationObfuscator.spec';
+import './unit-tests/node-obfuscators/FunctionObfuscator.spec';
+
+/**
+ * Functional tests
+ */
+import './functional-tests/JavaScriptObfuscator.spec';
+import './functional-tests/JavaScriptObfuscatorCLI.spec';
+import './functional-tests/JavaScriptObfuscatorInternal.spec';
\ No newline at end of file