diff --git a/src/org/openj9/envInfo/JavaInfo.java b/src/org/openj9/envInfo/JavaInfo.java
index 46242d7f..7dea134c 100644
--- a/src/org/openj9/envInfo/JavaInfo.java
+++ b/src/org/openj9/envInfo/JavaInfo.java
@@ -259,7 +259,7 @@ public String getTestFlag() {
         checkJFR();
         String envTf = System.getenv("TEST_FLAG");
         String paddedTf = null;
-        if (envTf != null) {
+        if (envTf != null && !envTf.isEmpty()) {
             testFlag = envTf;
             paddedTf =  "," + envTf + ",";
         }