diff --git a/.dockerignore b/.dockerignore
index 80bb20e2c..44d0bd178 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -14,6 +14,7 @@ dist
 
 # tests are not run in the docker container.
 test
+__tests__
 
 # we won't use the .git folder in production.
 .git
diff --git a/.eslintignore b/.eslintignore
index cd0b1a983..2702e0a4d 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,5 @@
 dist
 docs
-client/lib
 **/*.html
 plugins/*
 !plugins/talk-plugin-facebook-auth
diff --git a/.gitignore b/.gitignore
index f5482fd36..882c24883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ client/coral-framework/graphql/introspection.json
 *.swp
 *.DS_STORE
 
-test/e2e/reports
 coverage/
 
 plugins.json
diff --git a/circle.yml b/circle.yml
index 373b45012..f6b35970c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -40,8 +40,6 @@ test:
   override:
     # Run the tests using the junit reporter.
     - MOCHA_FILE=$CIRCLE_TEST_REPORTS/junit/test-results.xml MOCHA_REPORTER=mocha-junit-reporter yarn test
-    # Run the e2e test suite.
-    # - E2E_REPORT_PATH=$CIRCLE_TEST_REPORTS/e2e yarn e2e
 
 deployment:
   release:
diff --git a/docs/_docs/01-03-install-source.md b/docs/_docs/01-03-install-source.md
index 66dc94db6..da6fa120d 100644
--- a/docs/_docs/01-03-install-source.md
+++ b/docs/_docs/01-03-install-source.md
@@ -72,7 +72,6 @@ You can see other scripts we've made available by consulting the `package.json`
 file under the `scripts` key including:
 
 - `yarn test` run unit tests
-- `yarn e2e` run end to end tests
 - `yarn build-watch` watch for changes to client files and build static assets
 - `yarn dev-start` watch for changes to server files and reload the server while
   also sourcing a `.env` file in your local directory for configuration
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
deleted file mode 100644
index b2a2b9baa..000000000
--- a/nightwatch.conf.js
+++ /dev/null
@@ -1,54 +0,0 @@
-require('babel-core/register');
-
-let E2E_REPORT_PATH = './test/e2e/reports';
-if (process.env.E2E_REPORT_PATH && process.env.E2E_REPORT_PATH.length > 0) {
-  E2E_REPORT_PATH = process.env.E2E_REPORT_PATH;
-}
-
-module.exports = {
-  'src_folders': './test/e2e/tests',
-  'output_folder': E2E_REPORT_PATH,
-  'page_objects_path': './test/e2e/pages',
-  'globals_path': './test/e2e/globals',
-  'custom_commands_path' : '',
-  'custom_assertions_path' : '',
-  'selenium': {
-    'start_process': true,
-    'server_path': 'node_modules/selenium-standalone/.selenium/selenium-server/2.53.1-server.jar',
-    'log_path': E2E_REPORT_PATH,
-    'host': '127.0.0.1',
-    'port': 6666,
-    'cli_args': {
-      'webdriver.chrome.driver': 'node_modules/selenium-standalone/.selenium/chromedriver/2.25-x64-chromedriver'
-    }
-  },
-  'test_settings': {
-    'default': {
-      'launch_url' : 'http://localhost:3011',
-      'selenium_port': 6666,
-      'selenium_host': 'localhost',
-      'silent': true,
-      'desiredCapabilities': {
-        'browserName': 'chrome',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true,
-        'webStorageEnabled': true,
-        'databaseEnabled': true,
-        'applicationCacheEnabled': false,
-        'nativeEvents': true
-      },
-      'screenshots' : {
-        'enabled': true,
-        'on_failure': true,
-        'on_error': true,
-        'path': E2E_REPORT_PATH
-      },
-      'exclude': [
-        './tests/e2e/tests/EmbedStreamTests.js'
-      ]
-    },
-    'integration': {
-      'launch_url': 'http://localhost:3011'
-    }
-  }
-};
diff --git a/package.json b/package.json
index 9801c6ead..29a8bdcaa 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,6 @@
     "hammerjs": "^2.0.8",
     "helmet": "^3.5.0",
     "history": "^3.0.0",
-    "ignore-styles": "^5.0.1",
     "immutability-helper": "^2.2.0",
     "imports-loader": "^0.7.1",
     "inquirer": "^3.2.1",
diff --git a/test/mocha.opts b/test/mocha.opts
index 8753f4318..2b6128133 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,7 +1,5 @@
 test/helpers/*.js
 test/server
---compilers js:babel-core/register
---require ignore-styles
 --recursive
 --colors
 --sort
diff --git a/yarn.lock b/yarn.lock
index eb513b370..0b4d2f04a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3591,10 +3591,6 @@ ignore-by-default@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
-ignore-styles@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-styles/-/ignore-styles-5.0.1.tgz#b49ef2274bdafcd8a4880a966bfe38d1a0bf4671"
-
 ignore@^3.2.0:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"