diff --git a/config/karma.conf.js b/config/karma.conf.js
index 366be9645..a8e1eed9e 100644
--- a/config/karma.conf.js
+++ b/config/karma.conf.js
@@ -16,11 +16,11 @@ module.exports = function(config) {
 		files: [
 			'../src/**/*__tests__*/**/*spec.ut.js', // UT
 			'../test/specs/no-jsx/**/*spec.browser.js', // AT
-			'../test/specs/no-jsx/**/*spec.server.js', // AT
-			'../test/specs/no-jsx/**/*spec.js', // AT
+			//'../test/specs/no-jsx/**/*spec.server.js', // AT
+//			'../test/specs/no-jsx/**/*spec.js', // AT
 			'../test/specs/jsx/**/*spec.browser.js', // AT
-			'../test/specs/jsx/**/*spec.server.js', // AT
-			'../test/specs/jsx/**/*spec.js' // AT
+			//'../test/specs/jsx/**/*spec.server.js', // AT
+			//'../test/specs/jsx/**/*spec.js' // AT
 
 		],
 		// list of files to exclude
diff --git a/config/webpack.dev.conf.js b/config/webpack.dev.conf.js
index 61bbbcdd0..cf45ba992 100644
--- a/config/webpack.dev.conf.js
+++ b/config/webpack.dev.conf.js
@@ -1,12 +1,12 @@
 const webpack = require('webpack');
 const glob = require('glob');
 
-const entries = glob.sync('./test/specs/no-jsx/**/*.spec.js')
-	.concat(glob.sync('./test/specs/no-jsx/**/*.spec.browser.js'))
-	.concat(glob.sync('./test/specs/no-jsx/**/*.spec.server.js'))
+const entries = glob.sync('./test/specs/no-jsx/**/*.spec.browser.js.spec.js')
+	//.concat(glob.sync('./test/specs/no-jsx/**/*.spec.js'))
+    //	.concat(glob.sync('./test/specs/no-jsx/**/*.spec.server.js'))
 	.concat(glob.sync('./test/specs/jsx/**/*.spec.browser.js'))
-	.concat(glob.sync('./test/specs/jsx/**/*.spec.server.js'))
-	.concat(glob.sync('./test/specs/jsx/**/*.spec.js'))
+    //.concat(glob.sync('./test/specs/jsx/**/*.spec.server.js'))
+    //.concat(glob.sync('./test/specs/jsx/**/*.spec.js'))
 	.map(function(file) { return 'mocha!' + file; });
 
 module.exports = {