--- a/jdk/test/java/net/MulticastSocket/TestInterfaces.java	Tue May 26 12:34:51 2015 -0700
+++ b/jdk/test/java/net/MulticastSocket/TestInterfaces.java	Wed May 27 13:04:32 2015 +0100
@@ -46,6 +46,11 @@
         while (nifs.hasMoreElements()) {
             NetworkInterface ni = (NetworkInterface)nifs.nextElement();
 
+            // JDK-8022963, Skip (Windows) Teredo Tunneling Pseudo-Interface
+            String dName = ni.getDisplayName();
+            if (isWindows && dName != null && dName.contains("Teredo"))
+                continue;
+
             /*
              * Test MulticastSocket.getInterface
              */
@@ -92,10 +97,6 @@
                 continue;
             }
 
-            // JDK-8022963, Skip (Windows) Teredo Tunneling Pseudo-Interface
-            String dName = ni.getDisplayName();
-            if (isWindows && dName != null && dName.contains("Teredo"))
-                continue;
 
             NetworkInterface curr = soc.getNetworkInterface();
             if (!curr.equals(ni)) {