diff --git a/build.sh b/build.sh
index 0ef08e5e050b1b633550444ea7f2b6a492ff1ea7..9a651c524ec44b71994cb9a0a2592ace67b5febd 100755
--- a/build.sh
+++ b/build.sh
@@ -32,6 +32,7 @@ build=false
 test_=false
 build_bootstrap=false
 use_bootstrap=false
+stop_vbcscompiler=false
 
 # LTTNG is the logging infrastructure used by coreclr.  Need this variable set
 # so it doesn't output warnings to the console.
@@ -78,6 +79,10 @@ do
         use_bootstrap=true
         shift 1
         ;;
+        --stop-vbcscompiler)
+        stop_vbcscompiler=true
+        shift 1
+        ;;
         *)
         usage
         exit 1
@@ -115,6 +120,12 @@ then
     dotnet build "${root_path}"/Compilers.sln ${build_args} "/bl:${binaries_path}/Build.binlog"
 fi
 
+if [[ "${stop_vbcscompiler}" == true ]]
+then
+    echo "Stopping VBCSCompiler"
+    dotnet "${bootstrap_path}"/bincore/VBCSCompiler.dll -shutdown
+fi
+
 if [[ "${test_}" == true ]]
 then
     "${root_path}"/build/scripts/tests.sh "${build_configuration}"
diff --git a/build/scripts/cibuild.sh b/build/scripts/cibuild.sh
index 987b8588adef7c4d69870cff896361548f300563..803e32a09f67781556b85e9dde26729041d942f6 100755
--- a/build/scripts/cibuild.sh
+++ b/build/scripts/cibuild.sh
@@ -24,7 +24,4 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 echo "Building this commit:"
 git show --no-patch --pretty=raw HEAD
 
-"${root_path}"/build.sh --restore --bootstrap --build --test "$@"
-
-echo "Killing VBCSCompiler"
-dotnet "${root_path}"/Binaries/Bootstrap/bincore/VBCSCompiler.dll -shutdown
+"${root_path}"/build.sh --restore --bootstrap --build --stop-vbcscompiler --test "$@"