diff --git a/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java b/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java
index 70c43704cbb..9b464c46669 100644
--- a/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java
+++ b/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @library /test/lib
  * @library /lib/testlibrary/
  * @modules jdk.httpserver
  * @build jdk.testlibrary.SimpleSSLContext
diff --git a/test/lib/jdk/test/lib/net/URIBuilder.java b/test/lib/jdk/test/lib/net/URIBuilder.java
index 179553fede8..8264c57ed96 100644
--- a/test/lib/jdk/test/lib/net/URIBuilder.java
+++ b/test/lib/jdk/test/lib/net/URIBuilder.java
@@ -61,6 +61,12 @@ public URIBuilder host(String host) {
         return this;
     }
 
+    public URIBuilder host(InetAddress address) {
+        String hostaddr = address.isAnyLocalAddress()
+               ? "localhost" : address.getHostAddress();
+        return host(hostaddr);
+    }
+
     public URIBuilder loopback() {
         return host(InetAddress.getLoopbackAddress().getHostAddress());
     }