diff --git a/tests/bin/modelQaTestRoutines.pm b/tests/bin/modelQaTestRoutines.pm
index 0fb95c9ac..60f0ce6c3 100644
--- a/tests/bin/modelQaTestRoutines.pm
+++ b/tests/bin/modelQaTestRoutines.pm
@@ -201,7 +201,7 @@ sub processTestSpec {
     @main::ModelParameters=();
     @main::TestVariants=@main::Variants;
     undef(%main::BiasFor);
-    if (%main::isGeneralFloatingPin) {
+    if (defined(%main::isGeneralFloatingPin)) {
         %main::isFloatingPin=%main::isGeneralFloatingPin;
     } else {
         undef(%main::isFloatingPin);
diff --git a/tests/bin/runQaTests.pl b/tests/bin/runQaTests.pl
index 4605e2e8a..2afaa6798 100755
--- a/tests/bin/runQaTests.pl
+++ b/tests/bin/runQaTests.pl
@@ -329,7 +329,7 @@ if ($reallyVerbose) {
     $flag="";
 }
 foreach $test (@Test) {
-    next if (%doTest && !$doTest{$test});
+    next if (defined(%doTest) && !$doTest{$test});
 
     if ($verbose) {print "\n****** Running test ($simulatorName): $test"}
 
@@ -343,7 +343,7 @@ foreach $test (@Test) {
         } else {
             $refFile="$resultsDirectory/$test.standard";
         }
-        next if (%doVariant && !$doVariant{$variant});
+        next if (defined(%doVariant) && !$doVariant{$variant});
         $simFile="$resultsDirectory/$test.$variant";
         if ($outputDc) {
             if (($forceSimulation || ! -r $simFile) && !$onlyDoComparison) {