diff --git a/run.sh b/run.sh
index 7546dc7..696ae83 100755
--- a/run.sh
+++ b/run.sh
@@ -56,12 +56,6 @@ else
   fi
 fi
 
-if [ ! -e "$JTREG_HOME" ] ; then
-  ball=jtreg5.1-b01.tar.gz
-  wget https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/$ball
-  tar -xf $ball
-fi
-
 if [ "x$JDK_MAJOR" == "x" ] ; then 
   JDK_MAJOR=8
   if [[ -e "$JAVA/bin/jshell" || -e "$JAVA/bin/jshell.exe" ]] ; then
@@ -73,6 +67,18 @@ if [ "x$JDK_MAJOR" == "x" ] ; then
 fi
 echo "treating jdk as: $JDK_MAJOR"
 
+if [ ! -e "$JTREG_HOME" ] ; then
+  if [ "0$JDK_MAJOR" -le "8" ] ; then
+    ball=jtreg-6+1.tar.gz
+    wget "https://github.com/andrlos/jtreg/releases/download/6.1-jtrfix-V01.0/$ball"
+  else
+    ball=jtreg-7.3+1.tar.gz
+    wget "https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/$ball"
+  fi
+  tar -xf $ball
+fi
+
+
 JAVA_OPTS="";
 if [ "0$JDK_MAJOR" -gt 11 ] ; then 
   JAVA_OPTS="-javaoption:-Djava.security.manager=allow"