diff --git a/util/weekly_build/03_SetupEnv.sh b/util/weekly_build/03_SetupEnv.sh
index 568599938..5c05d684d 100755
--- a/util/weekly_build/03_SetupEnv.sh
+++ b/util/weekly_build/03_SetupEnv.sh
@@ -21,10 +21,12 @@ for compiler in $COMPILERS; do
     cd $envdir
     spack env activate .
     spack config add "config:install_tree:padded_length:${PADDED_LENGTH:-200}"
+    # Optionally remove packages from spack.yaml. NOTE: fails if package is not spec'd.
+    if [ ! -z "$PACKAGES_TO_EXCLUDE" ]; then
+        spack remove $PACKAGES_TO_EXCLUDE
+    fi
     # Check for duplicates and fail before doing the "real" concretization:
     spack_wrapper log.concretize concretize --fresh
     ${SPACK_STACK_DIR:?}/util/show_duplicate_packages.py -i crtm-fix -i crtm -i esmf -i mapl -i neptune-env
-#   The following is not working at the moment, for seemingly a couple reasons. Therefore packages with test-only deps cannot be tested.
-#    spack concretize --force --fresh --test all | tee log.concretize_test
   done
 done