diff --git a/tests/bin/runjava b/tests/bin/runjava
index 0071d3963..9c985127b 100755
--- a/tests/bin/runjava
+++ b/tests/bin/runjava
@@ -54,16 +54,22 @@ if (defined $libpath) {
 }
 
 # put everything in our class path
-my $classpath = "-classpath $root/tests/dist/classes:$root/dist/classes:$jlib";
+my $classpath = "-classpath $root/tests/dist/classes:$root/dist/classes";
 
-# any zip or jar files in our lib/ directory get added to the class path
-if (opendir(DIR, "$root/lib")) {
-    foreach $lib (grep { /.(zip|jar)/ && -f "$root/lib/$_" } readdir(DIR)) {
-	$classpath .= ":$root/lib/$lib";
+# add zip and jar files from our lib/ directory and the system lib/ directory
+my @dirs = ( "$root/lib", "/usr/share/java" );
+foreach $dir (@dirs) {
+    if (opendir(DIR, $dir)) {
+        foreach $lib (grep { /.(zip|jar)/ && -f "$dir/$_" } readdir(DIR)) {
+            $classpath .= ":$dir/$lib";
+        }
+        closedir DIR;
     }
-    closedir DIR;
 }
 
+# finally add the standard classes
+$classpath = "$classpath:$jlib";
+
 # specify our server root (this is for server code)
 my $rootarg = "-Droot=$root";