diff --git a/build.sh b/build.sh
index d688d365f16..2f8e0bbc460 100755
--- a/build.sh
+++ b/build.sh
@@ -64,7 +64,6 @@ fi
 
 if [[ "$build_sysroot" == "1" ]]; then
     echo "[BUILD] sysroot"
-    export CG_CLIF_INCR_CACHE_DISABLED=1
     dir=$(pwd)
     cd "$target_dir"
     time "$dir/build_sysroot/build_sysroot.sh"
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index 2785a289d95..282ce4a582c 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -12,7 +12,6 @@ dir=$(pwd)
 # build scripts are still compiled using cg_llvm.
 export RUSTC=$dir"/bin/cg_clif_build_sysroot"
 export RUSTFLAGS=$RUSTFLAGS" --clif"
-export CG_CLIF_DISPLAY_CG_TIME=1
 
 cd "$(dirname "$0")"
 
diff --git a/scripts/ext_config.sh b/scripts/ext_config.sh
index eab41631e2b..7971f620df1 100644
--- a/scripts/ext_config.sh
+++ b/scripts/ext_config.sh
@@ -5,6 +5,7 @@
 set -e
 
 export CG_CLIF_DISPLAY_CG_TIME=1
+export CG_CLIF_INCR_CACHE_DISABLED=1
 
 export HOST_TRIPLE=$(rustc -vV | grep host | cut -d: -f2 | tr -d " ")
 export TARGET_TRIPLE=${TARGET_TRIPLE:-$HOST_TRIPLE}
diff --git a/scripts/tests.sh b/scripts/tests.sh
index a61774f479e..d37b57babe6 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -3,7 +3,7 @@
 set -e
 
 source build/config.sh
-export CG_CLIF_INCR_CACHE_DISABLED=1
+source scripts/ext_config.sh
 MY_RUSTC="$RUSTC $RUSTFLAGS -L crate=target/out --out-dir target/out -Cdebuginfo=2"
 
 function no_sysroot_tests() {
diff --git a/test.sh b/test.sh
index 4f3be076528..97d82c18d97 100755
--- a/test.sh
+++ b/test.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 set -e
 
-source scripts/ext_config.sh
-
 ./build.sh --without-sysroot "$@"
 
 rm -r target/out || true