diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/SystemNetworkInterface.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/SystemNetworkInterface.cs
index de2197321e5355..8a99feaeec369f 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/SystemNetworkInterface.cs
+++ b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/SystemNetworkInterface.cs
@@ -85,8 +85,7 @@ internal static unsafe NetworkInterface[] GetNetworkInterfaces()
             List<SystemNetworkInterface> interfaceList = new List<SystemNetworkInterface>();
 
             Interop.IpHlpApi.GetAdaptersAddressesFlags flags =
-                Interop.IpHlpApi.GetAdaptersAddressesFlags.IncludeGateways
-                | Interop.IpHlpApi.GetAdaptersAddressesFlags.IncludeWins;
+                Interop.IpHlpApi.GetAdaptersAddressesFlags.IncludeAllInterfaces;
 
             // Figure out the right buffer size for the adapter information.
             uint result = Interop.IpHlpApi.GetAdaptersAddresses(
diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs
index dcb12e8b7f87b0..5d5167be739f8e 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs
@@ -22,6 +22,7 @@ public NetworkInterfaceBasicTest(ITestOutputHelper output)
         [Fact]
         public void BasicTest_GetNetworkInterfaces_AtLeastOne()
         {
+
             Assert.NotEqual<int>(0, NetworkInterface.GetAllNetworkInterfaces().Length);
         }
 
@@ -50,7 +51,8 @@ public void BasicTest_AccessInstanceProperties_NoExceptions()
 
                 if (nic.NetworkInterfaceType == NetworkInterfaceType.Ethernet)
                 {
-                    Assert.Equal(6, nic.GetPhysicalAddress().GetAddressBytes().Length);
+                    var physicalAddressLength = nic.GetPhysicalAddress().GetAddressBytes().Length;
+                    Assert.True(physicalAddressLength == 0 || physicalAddressLength == 6);
                 }
             }
         }