diff --git a/test/reproducers/1897602/TestDiagnosticCommandImpl.sh b/test/reproducers/1897602/TestDiagnosticCommandImpl.sh
index 52d96da..39949bf 100644
--- a/test/reproducers/1897602/TestDiagnosticCommandImpl.sh
+++ b/test/reproducers/1897602/TestDiagnosticCommandImpl.sh
@@ -55,7 +55,7 @@ case "$OS" in
     ;;
 esac
 
-if $TESTJAVA/bin/java -version 2>&1 | grep 1.8.0 ; then
+if $TESTJAVA/bin/java -version 2>&1 | grep '1[.]8[.]0' ; then
   EXTFLAGS=""
 else
   EXTFLAGS='--add-modules jdk.crypto.cryptoki,java.base --add-exports jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED --add-opens jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED --add-exports java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED'
diff --git a/test/reproducers/2036462/runtest.sh b/test/reproducers/2036462/runtest.sh
index 8c5b3c5..f7bbc81 100644
--- a/test/reproducers/2036462/runtest.sh
+++ b/test/reproducers/2036462/runtest.sh
@@ -11,7 +11,7 @@ if [ "x$TESTSRC" == x ] ; then
   TESTSRC=.
 fi
 
-if $JAVA -version 2>&1 | grep 1.8.0 ; then
+if $JAVA -version 2>&1 | grep '1[.]8[.]0' ; then
   FLAGS=""
 else
   # this is needed for ojdk 16 and above
diff --git a/test/reproducers/6913047/run.sh b/test/reproducers/6913047/run.sh
index 4e1ed09..4359014 100644
--- a/test/reproducers/6913047/run.sh
+++ b/test/reproducers/6913047/run.sh
@@ -40,7 +40,7 @@ if [ $IS_WINDOWS = 'TRUE' ]; then
   JAVA=$(cygpath -m "$JAVA")
 fi
 
-if $TESTJAVA/bin/java -version 2>&1 | grep 1.8.0 ; then
+if $TESTJAVA/bin/java -version 2>&1 | grep '1[.]8[.]0' ; then
   EXTFLAGS=""
 else
   EXTFLAGS='--add-modules jdk.crypto.cryptoki,java.base --add-exports jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED --add-opens jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED --add-exports java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED'