diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index ccac794cba37..2c30f8170fdd 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -149,7 +149,8 @@ elif [[ "$1" == "bazel.ipv6_tests" ]]; then
   setup_clang_toolchain
   echo "Testing..."
   cd "${ENVOY_CI_DIR}"
-  bazel test ${BAZEL_TEST_OPTIONS} -c fastbuild //test/integration/... //test/common/network/...
+  bazel test ${BAZEL_TEST_OPTIONS} --test_env=ENVOY_IP_TEST_VERSIONS=v6only -c fastbuild \
+    //test/integration/... //test/common/network/...
   exit 0
 elif [[ "$1" == "bazel.api" ]]; then
   setup_clang_toolchain
diff --git a/ci/do_circle_ci_ipv6_tests.sh b/ci/do_circle_ci_ipv6_tests.sh
index fb0849924e50..e41d8c6013f6 100755
--- a/ci/do_circle_ci_ipv6_tests.sh
+++ b/ci/do_circle_ci_ipv6_tests.sh
@@ -10,8 +10,6 @@ export ENVOY_BUILD_DIR=/tmp/envoy-docker
 
 export TEST_TYPE="bazel.ipv6_tests"
 
-export BAZEL_EXTRA_TEST_OPTIONS="--test_env=ENVOY_IP_TEST_VERSIONS=v6only"
-
 function finish {
   echo "disk space at end of build:"
   df -h