diff --git a/cicd_tests/do-build.sh b/cicd_tests/do-build.sh
index a08d17dd61616191eda2e4683ba6375a9a3fd31c..2ea87c4665ef4cbab4078f18f408c32443c7b790 100755
--- a/cicd_tests/do-build.sh
+++ b/cicd_tests/do-build.sh
@@ -10,7 +10,7 @@ main()
 	pwd
 	hostname
 	whoami
-	env|grep CICD
+	env|grep "^CICD"
 
 	local orig_dir=$(pwd)
 
diff --git a/cicd_tests/do-clean.sh b/cicd_tests/do-clean.sh
index a6b66decb247d9b9f8d1e85ba268c2f8bca0fc01..95dc3b04bd7eed3a1c9bd554fcf9ffbe047547b8 100755
--- a/cicd_tests/do-clean.sh
+++ b/cicd_tests/do-clean.sh
@@ -10,7 +10,7 @@ main()
 	pwd
 	hostname
 	whoami
-	env|grep CICD
+	env|grep "^CICD"
 
 
 	if [[ $CICD_NIGHTLY == 1 ]] ; then