diff --git a/tests/tck-build-logic/src/main/groovy/org/graalvm/internal/tck/harness/TckExtension.java b/tests/tck-build-logic/src/main/groovy/org/graalvm/internal/tck/harness/TckExtension.java
index 8ae24f538..f029c4900 100644
--- a/tests/tck-build-logic/src/main/groovy/org/graalvm/internal/tck/harness/TckExtension.java
+++ b/tests/tck-build-logic/src/main/groovy/org/graalvm/internal/tck/harness/TckExtension.java
@@ -155,16 +155,15 @@ List<String> diffCoordinates(String baseCommit, String newCommit) {
             // If tck was changed we should retest everything, just to be safe.
             return getMatchingCoordinates("");
         }
-
         // First get all available coordinates, then filter them by if their corresponding metadata / tests directories
         // contain changed files.
         return getMatchingCoordinates("").stream().filter(c -> {
             Path metadataDir = getMetadataDir(c);
-            if (changed.get("metadata").stream().anyMatch(f -> f.startsWith(metadataDir))) {
+            if (changed.get("metadata") != null && changed.get("metadata").stream().anyMatch(f -> f.startsWith(metadataDir))) {
                 return true;
             }
             Path testDir = getTestDir(c);
-            if (changed.get("test").stream().anyMatch(f -> f.startsWith(testDir))) {
+            if (changed.get("test") != null && changed.get("test").stream().anyMatch(f -> f.startsWith(testDir))) {
                 return true;
             }
             return false;