diff --git a/.travis.yml b/.travis.yml
index 7ddf00439cc..a014151cf6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,8 @@ script:
  - 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
  - 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
  - 'if [ $TEST_SUITE = "kitchensink-eject" ]; then tasks/e2e-kitchensink-eject.sh; fi'
- - 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
  - 'if [ $TEST_SUITE = "monorepos" ]; then tasks/e2e-monorepos.sh; fi'
+ - 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
 env:
   matrix:
     - TEST_SUITE=simple
@@ -31,7 +31,3 @@ matrix:
   include:
     - node_js: 4
       env: TEST_SUITE=old-node
-    - node_js: 6
-      env: TEST_SUITE=kitchensink
-    - node_js: 6
-      env: TEST_SUITE=kitchensink-eject
diff --git a/appveyor.yml b/appveyor.yml
index f9fa49d0abc..306fa72b9fb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,9 +8,9 @@ environment:
       test_suite: "installs"
     - nodejs_version: 10
       test_suite: "kitchensink"
-    - nodejs_version: 8
+    - nodejs_version: 10
       test_suite: "kitchensink-eject"
-    - nodejs_version: 8
+    - nodejs_version: 10
       test_suite: "monorepos"
     - nodejs_version: 8
       test_suite: "simple"
@@ -18,9 +18,9 @@ environment:
       test_suite: "installs"
     - nodejs_version: 8
       test_suite: "kitchensink"
-    - nodejs_version: 6
+    - nodejs_version: 8
       test_suite: "kitchensink-eject"
-    - nodejs_version: 6
+    - nodejs_version: 8
       test_suite: "monorepos"
 cache:
   - node_modules -> appveyor.cleanup-cache.txt
diff --git a/tasks/e2e-kitchensink-eject.sh b/tasks/e2e-kitchensink-eject.sh
index 76a50f1b8be..ef7a511dc23 100755
--- a/tasks/e2e-kitchensink-eject.sh
+++ b/tasks/e2e-kitchensink-eject.sh
@@ -159,7 +159,7 @@ E2E_URL="http://localhost:3002" \
   CI=true NODE_PATH=src \
   NODE_ENV=development \
   BABEL_ENV=test \
-  node_modules/.bin/mocha --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
+  node_modules/.bin/mocha --timeout 30000 --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
 
 # Test "production" environment
 E2E_FILE=./build/index.html \
@@ -168,7 +168,7 @@ E2E_FILE=./build/index.html \
   BABEL_ENV=test \
   NODE_PATH=src \
   PUBLIC_URL=http://www.example.org/spa/ \
-  node_modules/.bin/mocha --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
+  node_modules/.bin/mocha --timeout 30000 --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
 
 # Cleanup
 cleanup