diff --git a/test/chplenv/printchplbuilds/printchplbuilds-print1.prediff b/test/chplenv/printchplbuilds/printchplbuilds-print1.prediff
index 17ff82150430..ed8299375e0c 100755
--- a/test/chplenv/printchplbuilds/printchplbuilds-print1.prediff
+++ b/test/chplenv/printchplbuilds/printchplbuilds-print1.prediff
@@ -36,8 +36,8 @@ chpl_vars = [
     ("CHPL_TARGET_CPU", None),
     ("CHPL_LOCALE_MODEL", None),
     ("CHPL_COMM", None),
-    ("CHPL_COMM_SUBSTRATE", None),
-    ("CHPL_GASNET_SEGMENT", None),
+    ("CHPL_COMM_SUBSTRATE", None, lambda env: env["CHPL_COMM"] == "gasnet"),
+    ("CHPL_GASNET_SEGMENT", None, lambda env: env["CHPL_COMM"] == "gasnet"),
     ("CHPL_LIBFABRIC", None, lambda env: env["CHPL_COMM"] == "ofi"),
     ("CHPL_COMM_OFI_OOB", None, lambda env: env["CHPL_COMM"] == "ofi"),
     ("CHPL_TASKS", None),
diff --git a/test/chplenv/printchplbuilds/printchplbuilds-print1.skipif b/test/chplenv/printchplbuilds/printchplbuilds-print1.skipif
new file mode 100755
index 000000000000..570f564b94ea
--- /dev/null
+++ b/test/chplenv/printchplbuilds/printchplbuilds-print1.skipif
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# skip if printchplbuilds finds more than 1 build
+# this messes up the parsing in the prediff
+chpl_python=$($CHPL_HOME/util/config/find-python.sh)
+printchplbuilds=$CHPL_HOME/util/chplenv/printchplbuilds.py
+
+if $chpl_python $printchplbuilds --bash 1 &>/dev/null; then
+  echo True
+else
+  echo False
+fi