diff --git a/Tests/IPAddressTests/nano.runsettings b/.runsettings
similarity index 89%
rename from Tests/IPAddressTests/nano.runsettings
rename to .runsettings
index 93ce85ea..ed33e902 100644
--- a/Tests/IPAddressTests/nano.runsettings
+++ b/.runsettings
@@ -3,14 +3,14 @@
    <!-- Configurations that affect the Test Framework -->
    <RunConfiguration>
        <ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
-       <TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
+       <TestSessionTimeout>60000</TestSessionTimeout><!-- Milliseconds -->
        <TargetFrameworkVersion>net48</TargetFrameworkVersion>
        <TargetPlatform>x64</TargetPlatform>
    </RunConfiguration>
    <nanoFrameworkAdapter>
        <Logging>None</Logging> <!--Set to the desired level of logging for Unit Test execution. Possible values are: None, Detailed, Verbose, Error. -->
        <IsRealHardware>False</IsRealHardware><!--Set to true to run tests on real hardware. -->
-       <RealHardwarePort>COM3</RealHardwarePort><!--Specify the COM port to use to connect to a nanoDevice. If none is specified, a device detection is performed and the 1st available one will be used. -->
+       <RealHardwarePort>COM9</RealHardwarePort><!--Specify the COM port to use to connect to a nanoDevice. If none is specified, a device detection is performed and the 1st available one will be used. -->
        <CLRVersion></CLRVersion><!--Specify the nanoCLR version to use. If not specified, the latest available will be used. -->
        <PathToLocalCLRInstance></PathToLocalCLRInstance><!--Specify the path to a local nanoCLR instance. If not specified, the default one installed with nanoclr CLR witll be used. -->
    </nanoFrameworkAdapter>
diff --git a/Tests/IPAddressTests/IPAddressTests.nfproj b/Tests/IPAddressTests/IPAddressTests.nfproj
index 25a768d8..05976529 100644
--- a/Tests/IPAddressTests/IPAddressTests.nfproj
+++ b/Tests/IPAddressTests/IPAddressTests.nfproj
@@ -25,9 +25,6 @@
     <RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <PropertyGroup>
-    <RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="IPAddressTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -50,7 +47,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="nano.runsettings" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -66,4 +62,4 @@
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Tests/NetworkHelperTests/NetworkHelperTests.nfproj b/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
index dfc82422..d34f9f16 100644
--- a/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
+++ b/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
@@ -25,9 +25,6 @@
     <RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <PropertyGroup>
-    <RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
-  </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
@@ -62,7 +59,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="nano.runsettings" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -75,4 +71,4 @@
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Tests/NetworkHelperTests/nano.runsettings b/Tests/NetworkHelperTests/nano.runsettings
deleted file mode 100644
index e82b99e2..00000000
--- a/Tests/NetworkHelperTests/nano.runsettings
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RunSettings>
-   <!-- Configurations that affect the Test Framework -->
-   <RunConfiguration>
-       <MaxCpuCount>1</MaxCpuCount>
-       <ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
-       <TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
-       <TargetFrameworkVersion>net48</TargetFrameworkVersion>
-       <TargetPlatform>x64</TargetPlatform>
-   </RunConfiguration>
-   <nanoFrameworkAdapter>
-       <Logging>None</Logging>
-       <IsRealHardware>False</IsRealHardware>
-   </nanoFrameworkAdapter>
-</RunSettings>
\ No newline at end of file
diff --git a/Tests/SocketTests/SocketTests.nfproj b/Tests/SocketTests/SocketTests.nfproj
index 756605c3..20a6ebbc 100644
--- a/Tests/SocketTests/SocketTests.nfproj
+++ b/Tests/SocketTests/SocketTests.nfproj
@@ -25,9 +25,6 @@
     <RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <PropertyGroup>
-    <RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="SocketOptionsTests.cs" />
     <Compile Include="SocketPair.cs" />
@@ -53,7 +50,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="nano.runsettings" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -66,4 +62,4 @@
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Tests/SocketTests/nano.runsettings b/Tests/SocketTests/nano.runsettings
deleted file mode 100644
index e82b99e2..00000000
--- a/Tests/SocketTests/nano.runsettings
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RunSettings>
-   <!-- Configurations that affect the Test Framework -->
-   <RunConfiguration>
-       <MaxCpuCount>1</MaxCpuCount>
-       <ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
-       <TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
-       <TargetFrameworkVersion>net48</TargetFrameworkVersion>
-       <TargetPlatform>x64</TargetPlatform>
-   </RunConfiguration>
-   <nanoFrameworkAdapter>
-       <Logging>None</Logging>
-       <IsRealHardware>False</IsRealHardware>
-   </nanoFrameworkAdapter>
-</RunSettings>
\ No newline at end of file
diff --git a/nanoFramework.System.Net.sln b/nanoFramework.System.Net.sln
index 37ed83da..c1615af2 100644
--- a/nanoFramework.System.Net.sln
+++ b/nanoFramework.System.Net.sln
@@ -6,6 +6,7 @@ Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "System.Net", "nanoFramework
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{720DB1CD-932C-40AF-9B48-B7BEDB153EE9}"
 	ProjectSection(SolutionItems) = preProject
+		.runsettings = .runsettings
 		nanoFramework.System.Net.DELIVERABLES.nuspec = nanoFramework.System.Net.DELIVERABLES.nuspec
 		nanoFramework.System.Net.nuspec = nanoFramework.System.Net.nuspec
 		NuGet.Config = NuGet.Config