diff --git a/tests/all.sh b/tests/all.sh
--- a/tests/all.sh
+++ b/tests/all.sh
@@ -106,17 +106,18 @@
 ############################## run_tests ###############################
 # run test suites defined in TESTS variable, skip scripts defined in
 # TESTS_SKIP variable
 ########################################################################
 run_tests()
 {
     for TEST in ${TESTS}
     do
-        echo "${TESTS_SKIP}" | grep "${TEST}" > /dev/null
+        echo "Checking if ${TEST} should be skipped based on skip list [${TESTS_SKIP}]"
+        echo "${TESTS_SKIP}" | grep -w "${TEST}" > /dev/null
         if [ $? -eq 0 ]; then
             continue
         fi
 
         SCRIPTNAME=${TEST}.sh
         echo "Running tests for ${TEST}"
         echo "TIMESTAMP ${TEST} BEGIN: `date`" 
         (cd ${QADIR}/${TEST}; . ./${SCRIPTNAME} 2>&1)