diff --git a/makefile b/makefile
index 2c5ce790..8ee20d2e 100644
--- a/makefile
+++ b/makefile
@@ -38,7 +38,6 @@ endif
 
 UNAME := uname
 UNAME_OS := $(shell $(UNAME) -s | cut -f1 -d_)
-$(info UNAME_OS is $(UNAME_OS))
 ifeq ($(findstring CYGWIN,$(UNAME_OS)), CYGWIN)
 	LIB_DIR:=$(shell cygpath -w $(LIB_DIR))
 endif
diff --git a/src/org/openj9/envInfo/EnvDetector.java b/src/org/openj9/envInfo/EnvDetector.java
index 98bd70ad..b0aff779 100644
--- a/src/org/openj9/envInfo/EnvDetector.java
+++ b/src/org/openj9/envInfo/EnvDetector.java
@@ -99,7 +99,7 @@ private static void getJavaInfo() {
 			output.write(JDK_VENDOR);
 			output.write(TEST_FLAG);
 			output.close();
-			if (JDK_VERSION.matches("2\\d") && SPECInfo.contains("zos")) {
+			if ((javaVersionInfo >= 21) && SPECInfo.contains("zos")) {
 				output = new BufferedWriter(new OutputStreamWriter(new FileOutputStream("AQACert.log"), Charset.forName("IBM-1047")));
 			} else {
 				output = new BufferedWriter(new OutputStreamWriter(new FileOutputStream("AQACert.log")));