diff --git a/makefile b/makefile
index 5037950cab..abd5aa2c7a 100755
--- a/makefile
+++ b/makefile
@@ -1452,7 +1452,7 @@ else
 endif
 
 .PHONY: jdk-test
-jdk-test: $(test-dep) $(build)/jdk-run-tests.sh $(build)/test.sh
+jdk-test: $(test-dep) $(build)/classpath.jar $(build)/jdk-run-tests.sh $(build)/test.sh
 	/bin/sh $(build)/jdk-run-tests.sh
 
 PHONY: audit-baseline
@@ -1502,7 +1502,7 @@ $(build)/run-tests.sh: $(test-classes) makefile $(build)/extra-dir/multi-classpa
 $(build)/jdk-run-tests.sh: $(test-classes) makefile $(build)/extra-dir/multi-classpath-test.txt $(build)/test/multi-classpath-test.txt
 	echo 'cd $$(dirname $$0)' > $(@)
 	echo "sh ./test.sh 2>/dev/null \\" >> $(@)
-	echo "$(shell echo $(library-path) | sed 's|$(build)|\.|g') /bin/true $(JAVA_HOME)/bin/java $(mode) \"-Djava.library.path=. -cp test:extra-dir:classpath\" \\" >> $(@)
+	echo "'' true $(JAVA_HOME)/bin/java $(mode) \"-Xmx128m -Djava.library.path=. -cp test:extra-dir:classpath\" \\" >> $(@)
 	echo "$(call class-names,$(test-build),$(filter-out $(test-support-classes), $(test-classes))) \\" >> $(@)
 	echo "$(continuation-tests) $(tail-tests)" >> $(@)
 
diff --git a/test/LazyLoading.java b/test/LazyLoading.java
index e94004b065..80d279e3f3 100644
--- a/test/LazyLoading.java
+++ b/test/LazyLoading.java
@@ -3,9 +3,9 @@ import java.io.FileInputStream;
 import java.io.IOException;
 
 public class LazyLoading {
-  private static boolean loadLazy;
+  public static boolean loadLazy;
 
-  private static void expect(boolean v) {
+  public static void expect(boolean v) {
     if (! v) throw new RuntimeException();
   }
 
@@ -104,8 +104,7 @@ public class LazyLoading {
         expect(lazy instanceof Lazy);
 
         // invokeinterface
-        Interface i = array[0];
-        expect(i.interfaceMethod() == 42);
+        expect(array[0].interfaceMethod() == 42);
 
         // invokestatic
         expect(Lazy.staticMethod() == 43);
diff --git a/test/test.sh b/test/test.sh
index ddb9f5b1f0..9990206ba7 100644
--- a/test/test.sh
+++ b/test/test.sh
@@ -12,7 +12,9 @@ tests=${@}
 
 log=log.txt
 
-export ${ld_path}
+if [[ ! -z ${ld_path} ]]; then
+  export ${ld_path}
+fi
 
 echo -n "" >${log}