--- a/test/jdk/java/net/Socket/LinkLocal.java	Wed May 08 12:45:02 2019 -0700
+++ b/test/jdk/java/net/Socket/LinkLocal.java	Tue Apr 16 13:06:23 2019 -0700
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4469866
+ * @library /test/lib
  * @summary Connecting to a link-local IPv6 address should not
  *          causes a SocketException to be thrown.
  * @library /test/lib
@@ -33,12 +34,13 @@
  * @run main/othervm -Djava.net.preferIPv4Stack=true LinkLocal
  */
 
-import jdk.test.lib.NetworkConfiguration;
-
 import java.net.*;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import jdk.test.lib.NetworkConfiguration;
+import jdk.test.lib.net.IPSupport;
+
 public class LinkLocal {
 
     static int testCount = 0;
@@ -120,6 +122,7 @@
     }
 
     public static void main(String args[]) throws Exception {
+        IPSupport.skipIfCurrentConfigurationIsInvalid();
 
         /*
          * If an argument is provided ensure that it's