diff --git a/Tests/IPAddressTests/IPAddressTests.nfproj b/Tests/IPAddressTests/IPAddressTests.nfproj
index 8f05606..03e2514 100644
--- a/Tests/IPAddressTests/IPAddressTests.nfproj
+++ b/Tests/IPAddressTests/IPAddressTests.nfproj
@@ -43,10 +43,10 @@
       <HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.TestFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.54\lib\nanoFramework.TestFramework.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.58\lib\netnano1.0\nanoFramework.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.54\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
+      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.58\lib\netnano1.0\nanoFramework.UnitTestLauncher.exe</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll</HintPath>
diff --git a/Tests/IPAddressTests/packages.config b/Tests/IPAddressTests/packages.config
index 97e9fa5..3d9c453 100644
--- a/Tests/IPAddressTests/packages.config
+++ b/Tests/IPAddressTests/packages.config
@@ -3,5 +3,5 @@
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.49" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.18" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Text" version="2.0.0-preview.18" targetFramework="netnano1.0" />
-  <package id="nanoFramework.TestFramework" version="4.0.0-preview.54" targetFramework="netnano1.0" developmentDependency="true" />
+  <package id="nanoFramework.TestFramework" version="4.0.0-preview.58" targetFramework="netnano1.0" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Tests/IPAddressTests/packages.lock.json b/Tests/IPAddressTests/packages.lock.json
index 8b71caa..f58094c 100644
--- a/Tests/IPAddressTests/packages.lock.json
+++ b/Tests/IPAddressTests/packages.lock.json
@@ -22,9 +22,9 @@
       },
       "nanoFramework.TestFramework": {
         "type": "Direct",
-        "requested": "[4.0.0-preview.54, 4.0.0-preview.54]",
-        "resolved": "4.0.0-preview.54",
-        "contentHash": "k9DzCviFe94YL23Vr41uII7XkH37M16qndlE12fSiyYA23wqv+qMpyv+e7ZxrckXm/ZAV4ydBgSTbgz30bAl5Q=="
+        "requested": "[4.0.0-preview.58, 4.0.0-preview.58]",
+        "resolved": "4.0.0-preview.58",
+        "contentHash": "9og25km8L7R1m2s0QmYUSIKRYksQJVxV3BZr9OfmcBRbAfedxdhZfOQ1Z01lUWpK0Fq7zxUthkf8t4Br0kDl8w=="
       }
     }
   }
diff --git a/Tests/NetworkHelperTests/NetworkHelperTests.nfproj b/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
index 8a7804e..0c025ce 100644
--- a/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
+++ b/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
@@ -52,10 +52,10 @@
       <HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.TestFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.54\lib\nanoFramework.TestFramework.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.58\lib\netnano1.0\nanoFramework.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.54\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
+      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.58\lib\netnano1.0\nanoFramework.UnitTestLauncher.exe</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll</HintPath>
diff --git a/Tests/NetworkHelperTests/packages.config b/Tests/NetworkHelperTests/packages.config
index 207a137..4ea1cfd 100644
--- a/Tests/NetworkHelperTests/packages.config
+++ b/Tests/NetworkHelperTests/packages.config
@@ -4,5 +4,5 @@
   <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.18" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Text" version="2.0.0-preview.18" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="2.0.0-preview.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.TestFramework" version="4.0.0-preview.54" targetFramework="netnano1.0" developmentDependency="true" />
+  <package id="nanoFramework.TestFramework" version="4.0.0-preview.58" targetFramework="netnano1.0" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Tests/NetworkHelperTests/packages.lock.json b/Tests/NetworkHelperTests/packages.lock.json
index 9523985..86ec4d7 100644
--- a/Tests/NetworkHelperTests/packages.lock.json
+++ b/Tests/NetworkHelperTests/packages.lock.json
@@ -28,9 +28,9 @@
       },
       "nanoFramework.TestFramework": {
         "type": "Direct",
-        "requested": "[4.0.0-preview.54, 4.0.0-preview.54]",
-        "resolved": "4.0.0-preview.54",
-        "contentHash": "k9DzCviFe94YL23Vr41uII7XkH37M16qndlE12fSiyYA23wqv+qMpyv+e7ZxrckXm/ZAV4ydBgSTbgz30bAl5Q=="
+        "requested": "[4.0.0-preview.58, 4.0.0-preview.58]",
+        "resolved": "4.0.0-preview.58",
+        "contentHash": "9og25km8L7R1m2s0QmYUSIKRYksQJVxV3BZr9OfmcBRbAfedxdhZfOQ1Z01lUWpK0Fq7zxUthkf8t4Br0kDl8w=="
       }
     }
   }
diff --git a/Tests/SocketTests/SocketTests.nfproj b/Tests/SocketTests/SocketTests.nfproj
index dce9574..6025358 100644
--- a/Tests/SocketTests/SocketTests.nfproj
+++ b/Tests/SocketTests/SocketTests.nfproj
@@ -46,10 +46,10 @@
       <HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.TestFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.54\lib\nanoFramework.TestFramework.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.58\lib\netnano1.0\nanoFramework.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.54\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
+      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.58\lib\netnano1.0\nanoFramework.UnitTestLauncher.exe</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll</HintPath>
diff --git a/Tests/SocketTests/packages.config b/Tests/SocketTests/packages.config
index 97e9fa5..3d9c453 100644
--- a/Tests/SocketTests/packages.config
+++ b/Tests/SocketTests/packages.config
@@ -3,5 +3,5 @@
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.49" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.18" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Text" version="2.0.0-preview.18" targetFramework="netnano1.0" />
-  <package id="nanoFramework.TestFramework" version="4.0.0-preview.54" targetFramework="netnano1.0" developmentDependency="true" />
+  <package id="nanoFramework.TestFramework" version="4.0.0-preview.58" targetFramework="netnano1.0" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Tests/SocketTests/packages.lock.json b/Tests/SocketTests/packages.lock.json
index 8b71caa..f58094c 100644
--- a/Tests/SocketTests/packages.lock.json
+++ b/Tests/SocketTests/packages.lock.json
@@ -22,9 +22,9 @@
       },
       "nanoFramework.TestFramework": {
         "type": "Direct",
-        "requested": "[4.0.0-preview.54, 4.0.0-preview.54]",
-        "resolved": "4.0.0-preview.54",
-        "contentHash": "k9DzCviFe94YL23Vr41uII7XkH37M16qndlE12fSiyYA23wqv+qMpyv+e7ZxrckXm/ZAV4ydBgSTbgz30bAl5Q=="
+        "requested": "[4.0.0-preview.58, 4.0.0-preview.58]",
+        "resolved": "4.0.0-preview.58",
+        "contentHash": "9og25km8L7R1m2s0QmYUSIKRYksQJVxV3BZr9OfmcBRbAfedxdhZfOQ1Z01lUWpK0Fq7zxUthkf8t4Br0kDl8w=="
       }
     }
   }