diff --git a/buildenv/jenkins/common/variables-functions.groovy b/buildenv/jenkins/common/variables-functions.groovy
index cec3ade2d55..517a71befcf 100644
--- a/buildenv/jenkins/common/variables-functions.groovy
+++ b/buildenv/jenkins/common/variables-functions.groovy
@@ -710,11 +710,16 @@ def set_test_targets() {
     // Map of Maps
     TESTS = [:]
     if (TESTS_TARGETS != 'none') {
+        hasValhallaSpec = SPECS.any{SPEC, target -> SPEC.contains("valhalla")}
+
         for (target in TESTS_TARGETS.replaceAll("\\s","").toLowerCase().tokenize(',')) {
             switch (target) {
                 case ["sanity"]:
                     TESTS["${target}.functional"] = [:]
-                    TESTS["${target}.openjdk"] = [:]
+                    // Valhalla-specific testing does not yet support sanity.openjdk
+                    // Only expand sanity to sanity.functional if any SPEC is valhalla
+                    if (!hasValhallaSpec)
+                        TESTS["${target}.openjdk"] = [:]
                     break
                 case ["extended"]:
                     TESTS["${target}.functional"] = [:]