diff --git a/.circleci/config.yml b/.circleci/config.yml
index 27e2ff9978..beb31f3e41 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,10 +60,10 @@ jobs:
             java -version
       - run:
           name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
       - run:
           name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
           background: true
       - run: ./apps/remix-ide/ci/browser_tests_chrome.sh
       - store_test_results:
@@ -97,10 +97,10 @@ jobs:
       - run: npm run build
       - run:
           name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
       - run:
           name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
           background: true
       - run:
           name: Download Latest Firefox
@@ -147,10 +147,10 @@ jobs:
             java -version
       - run:
           name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
       - run:
           name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
           background: true
       - run: ./apps/remix-ide/ci/browser_tests_run_deploy.sh
       - store_artifacts:
diff --git a/apps/remix-ide/seleniumConfig.js b/apps/remix-ide-e2e/seleniumConfig.js
similarity index 100%
rename from apps/remix-ide/seleniumConfig.js
rename to apps/remix-ide-e2e/seleniumConfig.js
diff --git a/apps/remix-ide/nightwatch.js b/apps/remix-ide/nightwatch.js
deleted file mode 100644
index 87001de515..0000000000
--- a/apps/remix-ide/nightwatch.js
+++ /dev/null
@@ -1,84 +0,0 @@
-'use strict'
-require('@babel/register')()
-
-const crxFile = require('fs').readFileSync('apps/remix-ide/test-browser/extensions/chrome/metamask.crx')
-const metamaskExtension = new Buffer.from(crxFile).toString('base64') // eslint-disable-line
-
-module.exports = {
-  'src_folders': ['apps/remix-ide/test-browser/tests'],
-  'output_folder': 'apps/remix-ide/reports/tests',
-  'custom_commands_path': ['apps/remix-ide/test-browser/commands'],
-  'custom_assertions_path': '',
-  'page_objects_path': '',
-  'globals_path': '',
-
-  'test_settings': {
-    'default': {
-      'selenium_port': 4444,
-      'selenium_host': 'localhost',
-      'globals': {
-        'waitForConditionTimeout': 10000,
-        'asyncHookTimeout': 100000
-      },
-      'screenshots': {
-        'enabled': true,
-        'path': 'apps/remix-ide/reports/screenshots',
-        'on_failure': true,
-        'on_error': true
-      },
-      'desiredCapabilities': {
-        'browserName': 'firefox',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      },
-      'exclude': ['apps/remix-ide/test-browser/tests/runAndDeploy.js']
-    },
-
-    'chrome': {
-      'desiredCapabilities': {
-        'browserName': 'chrome',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true,
-        'goog:chromeOptions': {
-          'args': ['window-size=2560,1440', 'start-fullscreen']
-        }
-      }
-    },
-
-    'chrome-runAndDeploy': {
-      'desiredCapabilities': {
-        'browserName': 'chrome',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true,
-        'goog:chromeOptions': {
-          'args': ['window-size=2560,1440', 'start-fullscreen'],
-          'extensions': [metamaskExtension]
-        }
-      }
-    },
-
-    'safari': {
-      'desiredCapabilities': {
-        'browserName': 'safari',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    },
-
-    'ie': {
-      'desiredCapabilities': {
-        'browserName': 'internet explorer',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    },
-
-    'firefox': {
-      'desiredCapabilities': {
-        'browserName': 'firefox',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    }
-  }
-}
diff --git a/apps/remix-ide/nightwatch_debugger.js b/apps/remix-ide/nightwatch_debugger.js
deleted file mode 100644
index 84c899d99c..0000000000
--- a/apps/remix-ide/nightwatch_debugger.js
+++ /dev/null
@@ -1,101 +0,0 @@
-'use strict'
-var buildId = process.env.CIRCLE_BUILD_NUM || process.env.TRAVIS_JOB_NUMBER
-
-module.exports = {
-  'src_folders': ['./test-browser-debugger/test'],
-  'output_folder': './test-browser-debugger/test/reports',
-  'custom_commands_path': '',
-  'custom_assertions_path': '',
-  'globals_path': '',
-  'page_objects_path': '',
-
-  'selenium': {
-    'start_process': false,
-    'server_path': '',
-    'log_path': '',
-    'host': '127.0.0.1',
-    'port': 4444,
-    'cli_args': {
-      'webdriver.chrome.driver': '',
-      'webdriver.ie.driver': '',
-      'webdriver.firefox.profile': ''
-    }
-  },
-
-  'test_settings': {
-    'default': {
-      'launch_url': 'http://ondemand.saucelabs.com:80',
-      'selenium_host': 'ondemand.saucelabs.com',
-      'selenium_port': 80,
-      'silent': true,
-      'username': 'yanneth',
-      'access_key': '1f5a4560-b02b-41aa-b52b-f033aad30870',
-      'use_ssl': false,
-      'globals': {
-        'waitForConditionTimeout': 10000,
-        'asyncHookTimeout': 100000
-      },
-      'screenshots': {
-        'enabled': false,
-        'path': ''
-      },
-      'desiredCapabilities': {
-        'browserName': 'firefox',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true,
-        'build': 'build-' + buildId,
-        'tunnel-identifier': 'remix_tests_' + buildId
-      }
-    },
-
-    'chrome': {
-      'desiredCapabilities': {
-        'browserName': 'chrome',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true,
-        'build': 'build-' + buildId,
-        'tunnel-identifier': 'remix_tests_' + buildId
-      }
-    },
-
-    'safari': {
-      'desiredCapabilities': {
-        'browserName': 'safari',
-        'javascriptEnabled': true,
-        'platform': 'OS X 10.11',
-        'version': '10.0',
-        'acceptSslCerts': true,
-        'build': 'build-' + buildId,
-        'tunnel-identifier': 'remix_tests_' + buildId
-      }
-    },
-
-    'ie': {
-      'desiredCapabilities': {
-        'browserName': 'internet explorer',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true,
-        'platform': 'Windows 10',
-        'version': '11.103',
-        'build': 'build-' + buildId,
-        'tunnel-identifier': 'remix_tests_' + buildId
-      }
-    },
-
-    'local': {
-      'launch_url': 'http://localhost',
-      'selenium_host': '127.0.0.1',
-      'selenium_port': 4444,
-      'silent': true,
-      'screenshots': {
-        'enabled': false,
-        'path': ''
-      },
-      'desiredCapabilities': {
-        'browserName': 'firefox',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    }
-  }
-}