diff --git a/makefile b/makefile
index bbebd740a0..a7e4389511 100755
--- a/makefile
+++ b/makefile
@@ -1433,7 +1433,8 @@ endif
 class-name = $(patsubst $(1)/%.class,%,$(2))
 class-names = $(foreach x,$(2),$(call class-name,$(1),$(x)))
 
-test-flags = -Djava.library.path=$(build) -cp $(build)/test
+test-flags = -Djava.library.path=$(build) \
+	-cp $(build)/test$(target-path-separator)$(build)/extra-dir
 
 test-args = $(test-flags) $(input)
 
diff --git a/test/Misc.java b/test/Misc.java
index 274a7a0335..a4361a3bfd 100644
--- a/test/Misc.java
+++ b/test/Misc.java
@@ -302,14 +302,6 @@ public class Misc {
 	   (new byte[] { 0, 0, 0, 0 },
 	    java.net.InetAddress.getByName("0.0.0.0").getAddress()));
 
-    try {
-      java.net.InetAddress.getByName
-	("bs.thisdomaindoesntexistseriouslynoway");
-      throw new AssertionError();
-    } catch (java.net.UnknownHostException e) {
-      // cool
-    }
-
     expect(! staticRan);
     Static.run();
     expect(staticRan);