diff --git a/.travis.yml b/.travis.yml
index c37e98a11a..4326581272 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,6 @@ env:
     - CI_MODE=browserstack_optional
     - CI_MODE=aio_tools_test
     - CI_MODE=aio
-    - CI_MODE=aio_optional
     - CI_MODE=aio_e2e AIO_SHARD=0
     - CI_MODE=aio_e2e AIO_SHARD=1
     - CI_MODE=bazel
@@ -64,7 +63,6 @@ matrix:
   allow_failures:
     - env: "CI_MODE=saucelabs_optional"
     - env: "CI_MODE=browserstack_optional"
-    - env: "CI_MODE=aio_optional"
 
 before_install:
   # source the env.sh script so that the exported variables are available to other scripts later on
diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh
index 85e2273952..37a5050f35 100755
--- a/scripts/ci/install.sh
+++ b/scripts/ci/install.sh
@@ -50,8 +50,7 @@ travisFoldEnd "bower-install"
 if [[ ${TRAVIS} &&
   ${CI_MODE} == "aio" ||
   ${CI_MODE} == "aio_e2e" ||
-  ${CI_MODE} == "aio_tools_test" ||
-  ${CI_MODE} == "aio_optional"
+  ${CI_MODE} == "aio_tools_test"
 ]]; then
   # angular.io: Install all yarn dependencies according to angular.io/yarn.lock
   travisFoldStart "yarn-install.aio"
@@ -84,8 +83,7 @@ if [[ ${TRAVIS} &&
   ${CI_MODE} == "e2e" ||
   ${CI_MODE} == "e2e_2" ||
   ${CI_MODE} == "aio" ||
-  ${CI_MODE} == "aio_e2e" ||
-  ${CI_MODE} == "aio_optional"
+  ${CI_MODE} == "aio_e2e"
 ]]; then
   travisFoldStart "install-chromium"
     (
diff --git a/scripts/ci/test-aio-optional.sh b/scripts/ci/test-aio-optional.sh
deleted file mode 100755
index eecfe78f4c..0000000000
--- a/scripts/ci/test-aio-optional.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -u -e -o pipefail
-
-# Setup environment
-readonly thisDir=$(cd $(dirname $0); pwd)
-source ${thisDir}/_travis-fold.sh
-
-# run in subshell to avoid polluting cwd
-(
-  cd ${PROJECT_ROOT}/aio
-  # Run e2e tests
-  travisFoldStart "test.aio.e2e"
-    yarn setup
-    yarn e2e
-  travisFoldEnd "test.aio.e2e"
-
-)
diff --git a/scripts/ci/test-aio.sh b/scripts/ci/test-aio.sh
index 440c393d6e..6f4a143b9a 100755
--- a/scripts/ci/test-aio.sh
+++ b/scripts/ci/test-aio.sh
@@ -31,6 +31,12 @@ source ${thisDir}/_travis-fold.sh
   travisFoldEnd "test.aio.unit"
 
 
+  # Run e2e tests
+  travisFoldStart "test.aio.e2e"
+    yarn e2e
+  travisFoldEnd "test.aio.e2e"
+
+
   # Run unit tests for aio/aio-builds-setup
   travisFoldStart "test.aio.aio-builds-setup"
     ./aio-builds-setup/scripts/test.sh
diff --git a/scripts/ci/test.sh b/scripts/ci/test.sh
index 97f55d873c..a72da1aca7 100755
--- a/scripts/ci/test.sh
+++ b/scripts/ci/test.sh
@@ -46,9 +46,6 @@ case ${CI_MODE} in
   aio_e2e)
     ${thisDir}/test-aio-e2e.sh
     ;;
-  aio_optional)
-    ${thisDir}/test-aio-optional.sh
-    ;;
   bazel)
     ${thisDir}/test-bazel.sh
     ;;