diff --git a/build.sh b/build.sh
index d0f15148c..06efa7595 100755
--- a/build.sh
+++ b/build.sh
@@ -102,12 +102,6 @@ mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
 WORKFLOW_BUILD=${WORKFLOW_BUILD:-"OFF"}
 CMAKE_OPTS+=" -DWORKFLOW_TESTS=${WORKFLOW_BUILD}"
 
-# check if tier-2 testing needs to be activated
-if [[ $GDAS_TIER2_TESTING == "ON" ]]; then
-  echo "Activating tier-2 testing"
-  CMAKE_OPTS+=" -DGDAS_TIER2_TESTING=ON"
-fi
-
 # JCSDA changed test data things, need to make a dummy CRTM directory
 if [[ $BUILD_TARGET == 'hera' ]]; then
   if [ -d "$dir_root/bundle/fix/test-data-release/" ]; then rm -rf $dir_root/bundle/fix/test-data-release/; fi
diff --git a/ci/run_gw_ci.sh b/ci/run_gw_ci.sh
index dcd4744a3..f3d6116c1 100755
--- a/ci/run_gw_ci.sh
+++ b/ci/run_gw_ci.sh
@@ -72,6 +72,15 @@ cd $repodir/sorc/gdas.cd/build
 module use $repodir/sorc/gdas.cd/modulefiles
 module load GDAS/$TARGET
 echo "---------------------------------------------------" >> $outfile
+# Reconfigure if the tier-2 testing is required
+# TODO: Not the most efficient, but even when exported, the variable is out of scope
+#       when running build.sh
+if [ "$GDAS_TIER2_TESTING" == "ON" ]; then
+  echo "Tier-2 Testing: Activated" >> $outfile
+  cmake -DGDAS_TIER2_TESTING=ON .
+  exit $ctest_status
+fi
+
 rm -rf log.ctest
 ctest -R gdasapp --output-on-failure &>> log.ctest
 ctest_status=$?