diff --git a/libwvdrmengine/build_all_unit_tests.sh b/libwvdrmengine/build_all_unit_tests.sh
index 7db340b4..8cf8ed97 100755
--- a/libwvdrmengine/build_all_unit_tests.sh
+++ b/libwvdrmengine/build_all_unit_tests.sh
@@ -84,7 +84,7 @@ m -j $NUM_CORES $WV_UNITTESTS
 echo "waiting for device"
 ADB_OUTPUT=`adb $SERIAL_NUM root && echo ". " && adb $SERIAL_NUM wait-for-device remount`
 echo $ADB_OUTPUT
-if echo $ADB_OUTPUT | grep -qi "verity"; then
+if echo $ADB_OUTPUT | grep -qi "verity" | grep -vi "Verity is already disabled"; then
   echo
   echo "ERROR: This device has Verity enabled. build_and_run_all_unit_tests.sh "
   echo "does not work if Verity is enabled. Please disable Verity with"
diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh
index 8f0f524b..1aa1c84d 100755
--- a/libwvdrmengine/run_all_unit_tests.sh
+++ b/libwvdrmengine/run_all_unit_tests.sh
@@ -68,7 +68,7 @@ fi
 echo "waiting for device"
 ADB_OUTPUT=`adb $SERIAL_NUM root && echo ". " && adb $SERIAL_NUM wait-for-device remount`
 echo $ADB_OUTPUT
-if echo $ADB_OUTPUT | grep -qi "verity"; then
+if echo $ADB_OUTPUT | grep -qi "verity" | grep -vi "Verity is already disabled"; then
   echo
   echo "ERROR: This device has Verity enabled. run_all_unit_tests.sh does not "
   echo "work if Verity is enabled. Please disable Verity with"