diff --git a/package.json b/package.json
index 02c340ec41..a4a3456c7b 100644
--- a/package.json
+++ b/package.json
@@ -166,26 +166,26 @@
     "nightwatch_parallel": "nightwatch -e chrome,firefox --config nightwatch.js",
     "nightwatch_local_firefox": "nightwatch --config nightwatch.js --env firefox",
     "nightwatch_local_chrome": "nightwatch --config nightwatch.js --env chrome",
-    "nightwatch_local_ballot": "nightwatch ./test-browser/tests/ballot.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_libraryDeployment": "nightwatch ./test-browser/tests/libraryDeployment.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_solidityImport": "nightwatch ./test-browser/tests/solidityImport.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_recorder": "nightwatch ./test-browser/tests/recorder.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_transactionExecution": "nightwatch ./test-browser/tests/transactionExecution.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_staticAnalysis": "nightwatch ./test-browser/tests/staticAnalysis.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_signingMessage": "nightwatch ./test-browser/tests/signingMessage.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_specialFunctions": "nightwatch ./test-browser/tests/specialFunctions.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_solidityUnitTests": "nightwatch ./test-browser/tests/solidityUnittests.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_remixd": "nightwatch ./test-browser/tests/remixd.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_terminal": "nightwatch ./test-browser/tests/terminal.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_gist": "nightwatch ./test-browser/tests/gist.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_workspace": "nightwatch ./test-browser/tests/workspace.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_defaultLayout": "nightwatch ./test-browser/tests/defaultLayout.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_pluginManager": "nightwatch ./test-browser/tests/pluginManager.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_publishContract": "nightwatch ./test-browser/tests/publishContract.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_generalSettings": "nightwatch ./test-browser/tests/generalSettings.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_fileExplorer": "nightwatch ./test-browser/tests/fileExplorer.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_debugger": "nightwatch ./test-browser/tests/debugger.js --config nightwatch.js --env chrome ",
-    "nightwatch_local_editor": "nightwatch ./test-browser/tests/editor.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_ballot": "nightwatch ./test-browser/tests/ballot.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_libraryDeployment": "nightwatch ./test-browser/tests/libraryDeployment.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_solidityImport": "nightwatch ./test-browser/tests/solidityImport.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_recorder": "nightwatch ./test-browser/tests/recorder.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_transactionExecution": "nightwatch ./test-browser/tests/transactionExecution.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_staticAnalysis": "nightwatch ./test-browser/tests/staticAnalysis.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_signingMessage": "nightwatch ./test-browser/tests/signingMessage.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_specialFunctions": "nightwatch ./test-browser/tests/specialFunctions.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_solidityUnitTests": "nightwatch ./test-browser/tests/solidityUnittests.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_remixd": "nightwatch ./test-browser/tests/remixd.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_terminal": "nightwatch ./test-browser/tests/terminal.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_gist": "nightwatch ./test-browser/tests/gist.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_workspace": "nightwatch ./test-browser/tests/workspace.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_defaultLayout": "nightwatch ./test-browser/tests/defaultLayout.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_pluginManager": "nightwatch ./test-browser/tests/pluginManager.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_publishContract": "nightwatch ./test-browser/tests/publishContract.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_generalSettings": "nightwatch ./test-browser/tests/generalSettings.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_fileExplorer": "nightwatch ./test-browser/tests/fileExplorer.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_debugger": "nightwatch ./test-browser/tests/debugger.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_editor": "nightwatch ./test-browser/tests/editor.test.js --config nightwatch.js --env chrome ",
     
     "nightwatch_local_runAndDeploy": "nightwatch ./test-browser/tests/runAndDeploy.js --config nightwatch.js --env chrome-runAndDeploy ",
     "onchange": "onchange build/app.js -- npm-run-all lint",
diff --git a/test-browser/tests/ballot.js b/test-browser/tests/ballot.test.js
similarity index 100%
rename from test-browser/tests/ballot.js
rename to test-browser/tests/ballot.test.js
diff --git a/test-browser/tests/debugger.js b/test-browser/tests/debugger.test.js
similarity index 100%
rename from test-browser/tests/debugger.js
rename to test-browser/tests/debugger.test.js
diff --git a/test-browser/tests/defaultLayout.js b/test-browser/tests/defaultLayout.test.js
similarity index 100%
rename from test-browser/tests/defaultLayout.js
rename to test-browser/tests/defaultLayout.test.js
diff --git a/test-browser/tests/editor.js b/test-browser/tests/editor.test.js
similarity index 100%
rename from test-browser/tests/editor.js
rename to test-browser/tests/editor.test.js
diff --git a/test-browser/tests/fileExplorer.js b/test-browser/tests/fileExplorer.test.js
similarity index 100%
rename from test-browser/tests/fileExplorer.js
rename to test-browser/tests/fileExplorer.test.js
diff --git a/test-browser/tests/generalSettings.js b/test-browser/tests/generalSettings.test.js
similarity index 100%
rename from test-browser/tests/generalSettings.js
rename to test-browser/tests/generalSettings.test.js
diff --git a/test-browser/tests/gist.js b/test-browser/tests/gist.test.js
similarity index 100%
rename from test-browser/tests/gist.js
rename to test-browser/tests/gist.test.js
diff --git a/test-browser/tests/libraryDeployment.js b/test-browser/tests/libraryDeployment.test.js
similarity index 100%
rename from test-browser/tests/libraryDeployment.js
rename to test-browser/tests/libraryDeployment.test.js
diff --git a/test-browser/tests/pluginManager.js b/test-browser/tests/pluginManager.test.js
similarity index 100%
rename from test-browser/tests/pluginManager.js
rename to test-browser/tests/pluginManager.test.js
diff --git a/test-browser/tests/publishContract.js b/test-browser/tests/publishContract.test.js
similarity index 100%
rename from test-browser/tests/publishContract.js
rename to test-browser/tests/publishContract.test.js
diff --git a/test-browser/tests/recorder.js b/test-browser/tests/recorder.test.js
similarity index 100%
rename from test-browser/tests/recorder.js
rename to test-browser/tests/recorder.test.js
diff --git a/test-browser/tests/remixd.js b/test-browser/tests/remixd.test.js
similarity index 100%
rename from test-browser/tests/remixd.js
rename to test-browser/tests/remixd.test.js
diff --git a/test-browser/tests/signingMessage.js b/test-browser/tests/signingMessage.test.js
similarity index 100%
rename from test-browser/tests/signingMessage.js
rename to test-browser/tests/signingMessage.test.js
diff --git a/test-browser/tests/solidityImport.js b/test-browser/tests/solidityImport.test.js
similarity index 100%
rename from test-browser/tests/solidityImport.js
rename to test-browser/tests/solidityImport.test.js
diff --git a/test-browser/tests/solidityUnittests.js b/test-browser/tests/solidityUnittests.test.js
similarity index 100%
rename from test-browser/tests/solidityUnittests.js
rename to test-browser/tests/solidityUnittests.test.js
diff --git a/test-browser/tests/specialFunctions.js b/test-browser/tests/specialFunctions.test.js
similarity index 100%
rename from test-browser/tests/specialFunctions.js
rename to test-browser/tests/specialFunctions.test.js
diff --git a/test-browser/tests/staticAnalysis.js b/test-browser/tests/staticAnalysis.test.js
similarity index 100%
rename from test-browser/tests/staticAnalysis.js
rename to test-browser/tests/staticAnalysis.test.js
diff --git a/test-browser/tests/terminal.js b/test-browser/tests/terminal.test.js
similarity index 100%
rename from test-browser/tests/terminal.js
rename to test-browser/tests/terminal.test.js
diff --git a/test-browser/tests/transactionExecution.js b/test-browser/tests/transactionExecution.test.js
similarity index 100%
rename from test-browser/tests/transactionExecution.js
rename to test-browser/tests/transactionExecution.test.js
diff --git a/test-browser/tests/workspace.js b/test-browser/tests/workspace.test.js
similarity index 100%
rename from test-browser/tests/workspace.js
rename to test-browser/tests/workspace.test.js