--- a/test/jdk/tools/jpackage/junit/run_junit.sh	Tue Oct 15 14:00:04 2019 -0400
+++ b/test/jdk/tools/jpackage/junit/run_junit.sh	Wed Oct 16 09:57:23 2019 -0400
@@ -9,10 +9,11 @@
   exit
 fi
 
-classes=( "$@" )
 sources=()
-for c in "${classes[@]}"; do
-  sources+=( "${TESTSRC}/$(echo $c | sed -e 's|\.|/|g').java" )
+classes=()
+for s in $(find "${TESTSRC}" -name  "*.java" | grep -v junit.java); do
+  sources+=( "$s" )
+  classes+=( $(echo "$s" | sed -e "s|${TESTSRC}/||" -e 's|/|.|g' -e 's/.java$//') )
 done
 
 common_args=(\
@@ -28,4 +29,4 @@
 
 # Run junit
 "${TESTJAVA}/bin/java" ${TESTVMOPTS} ${TESTJAVAOPTS} \
-  "${common_args[@]}" org.junit.runner.JUnitCore "$@"
+  "${common_args[@]}" org.junit.runner.JUnitCore "${classes[@]}"