diff --git a/SharpAdbClient.Tests/ExceptionTester.cs b/SharpAdbClient.Tests/ExceptionTester.cs
index c6d5f28e..4e8dfec3 100644
--- a/SharpAdbClient.Tests/ExceptionTester.cs
+++ b/SharpAdbClient.Tests/ExceptionTester.cs
@@ -35,7 +35,7 @@ public static void TestMessageAndInnerConstructor(Func<string, Exception, T> con
             Assert.AreEqual(inner, ex.InnerException);
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         public static void TestSerializationConstructor(Func<SerializationInfo, StreamingContext, T> constructor)
         {
             var info = new SerializationInfo(typeof(T), new FormatterConverter());
diff --git a/SharpAdbClient.Tests/Exceptions/AdbExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/AdbExceptionTests.cs
index ce5d80bd..c03ccb62 100644
--- a/SharpAdbClient.Tests/Exceptions/AdbExceptionTests.cs
+++ b/SharpAdbClient.Tests/Exceptions/AdbExceptionTests.cs
@@ -24,7 +24,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<AdbException>.TestMessageAndInnerConstructor((message, inner) => new AdbException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {
diff --git a/SharpAdbClient.Tests/Exceptions/CommandAbortingExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/CommandAbortingExceptionTests.cs
index 673905d8..e60cd58d 100644
--- a/SharpAdbClient.Tests/Exceptions/CommandAbortingExceptionTests.cs
+++ b/SharpAdbClient.Tests/Exceptions/CommandAbortingExceptionTests.cs
@@ -24,7 +24,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<CommandAbortingException>.TestMessageAndInnerConstructor((message, inner) => new CommandAbortingException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {
diff --git a/SharpAdbClient.Tests/Exceptions/DeviceNotFoundException.cs b/SharpAdbClient.Tests/Exceptions/DeviceNotFoundException.cs
index 07bb1206..862c22b5 100644
--- a/SharpAdbClient.Tests/Exceptions/DeviceNotFoundException.cs
+++ b/SharpAdbClient.Tests/Exceptions/DeviceNotFoundException.cs
@@ -18,7 +18,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<DeviceNotFoundException>.TestMessageAndInnerConstructor((message, inner) => new DeviceNotFoundException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {
diff --git a/SharpAdbClient.Tests/Exceptions/PermissionDeniedExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/PermissionDeniedExceptionTests.cs
index 9f408e9f..d5a1ff01 100644
--- a/SharpAdbClient.Tests/Exceptions/PermissionDeniedExceptionTests.cs
+++ b/SharpAdbClient.Tests/Exceptions/PermissionDeniedExceptionTests.cs
@@ -24,7 +24,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<PermissionDeniedException>.TestMessageAndInnerConstructor((message, inner) => new PermissionDeniedException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {
diff --git a/SharpAdbClient.Tests/Exceptions/ShellCommandUnresponsiveExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/ShellCommandUnresponsiveExceptionTests.cs
index 6c578b42..d3a06440 100644
--- a/SharpAdbClient.Tests/Exceptions/ShellCommandUnresponsiveExceptionTests.cs
+++ b/SharpAdbClient.Tests/Exceptions/ShellCommandUnresponsiveExceptionTests.cs
@@ -25,7 +25,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<ShellCommandUnresponsiveException>.TestMessageAndInnerConstructor((message, inner) => new ShellCommandUnresponsiveException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {
diff --git a/SharpAdbClient.Tests/Exceptions/UnknownOptionExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/UnknownOptionExceptionTests.cs
index 98e2cc54..f2019b2d 100644
--- a/SharpAdbClient.Tests/Exceptions/UnknownOptionExceptionTests.cs
+++ b/SharpAdbClient.Tests/Exceptions/UnknownOptionExceptionTests.cs
@@ -24,7 +24,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<UnknownOptionException>.TestMessageAndInnerConstructor((message, inner) => new UnknownOptionException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {
diff --git a/SharpAdbClient.Tests/Properties/AssemblyInfo.cs b/SharpAdbClient.Tests/Properties/AssemblyInfo.cs
index 705f89c8..f2f096df 100644
--- a/SharpAdbClient.Tests/Properties/AssemblyInfo.cs
+++ b/SharpAdbClient.Tests/Properties/AssemblyInfo.cs
@@ -1,9 +1,3 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle ( "MADB Tests" )]
-[assembly: AssemblyDescription ( "" )]
-
-
-[assembly: Guid ( "4300994a-cbc1-43b0-bf87-119cd4cf71a3" )]
\ No newline at end of file
+[assembly: Guid("4300994a-cbc1-43b0-bf87-119cd4cf71a3")]
\ No newline at end of file
diff --git a/SharpAdbClient.Tests/SharpAdbClient.Tests.csproj b/SharpAdbClient.Tests/SharpAdbClient.Tests.csproj
deleted file mode 100644
index a63f5c47..00000000
--- a/SharpAdbClient.Tests/SharpAdbClient.Tests.csproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2C43B828-BE5E-47B6-93BB-A624B6B36633}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpAdbClient.Tests</RootNamespace>
-    <AssemblyName>SharpAdbClient.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SharpAdbClient.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AdbCommandLineClientExtensionsTests.cs" />
-    <Compile Include="AdbCommandLineClientTests.cs" />
-    <Compile Include="AdbResponseTests.cs" />
-    <Compile Include="AdbServerStatusTests.cs" />
-    <Compile Include="AdbServerTests.cs" />
-    <Compile Include="AdbClientTests.cs" />
-    <Compile Include="AdbSocketTests.cs" />
-    <Compile Include="AndroidProcessTests.cs" />
-    <Compile Include="ConsoleOutputReceiverTests.cs" />
-    <Compile Include="CustomEndPoint.cs" />
-    <Compile Include="DeviceCommands\AndroidProcessTests.cs" />
-    <Compile Include="DeviceDataTests.cs" />
-    <Compile Include="DeviceCommands\DeviceExtensionsTests.cs" />
-    <Compile Include="DeviceMonitorSink.cs" />
-    <Compile Include="DeviceMonitorTests.cs" />
-    <Compile Include="DummyAdbClient.cs" />
-    <Compile Include="DummyAdbCommandLineClient.cs" />
-    <Compile Include="DummyAdbServer.cs" />
-    <Compile Include="DummyAdbSocket.cs" />
-    <Compile Include="DummySyncService.cs" />
-    <Compile Include="DummyTcpSocket.cs" />
-    <Compile Include="EnvironmentVariablesReceiverTests.cs" />
-    <Compile Include="Exceptions\UnknownOptionExceptionTests.cs" />
-    <Compile Include="Exceptions\AdbExceptionTests.cs" />
-    <Compile Include="Exceptions\ShellCommandUnresponsiveExceptionTests.cs" />
-    <Compile Include="Exceptions\PermissionDeniedExceptionTests.cs" />
-    <Compile Include="Exceptions\DeviceNotFoundException.cs" />
-    <Compile Include="Exceptions\CommandAbortingExceptionTests.cs" />
-    <Compile Include="ExceptionTester.cs" />
-    <Compile Include="Extensions\ArrayHelperTests.cs" />
-    <Compile Include="ForwardDataTests.cs" />
-    <Compile Include="ForwardSpecTests.cs" />
-    <Compile Include="FramebufferHeaderTests.cs" />
-    <Compile Include="FramebufferTests.cs" />
-    <Compile Include="GetPropReceiverTests.cs" />
-    <Compile Include="IDummyAdbSocket.cs" />
-    <Compile Include="InstallReceiverTests.cs" />
-    <Compile Include="LinuxPathTests.cs" />
-    <Compile Include="LoggerTests.cs" />
-    <Compile Include="PackageManagerTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ShellStreamTests.cs" />
-    <Compile Include="SocketBasedTests.cs" />
-    <Compile Include="SyncCommandConverterTests.cs" />
-    <Compile Include="SyncServiceTests.cs" />
-    <Compile Include="TcpSocketTests.cs" />
-    <Compile Include="TracingAdbSocket.cs" />
-    <Compile Include="VersionInfoReceiverTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="framebuffer.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="framebufferheader-empty.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="framebufferheader.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="logcatevents.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="fstab.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="logcat.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="madb.xunit" />
-    <None Include="packages.config" />
-    <None Include="SharpAdbClient.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SharpAdbClient\SharpAdbClient.csproj">
-      <Project>{65473257-E70F-410B-9269-D0C0F771EA87}</Project>
-      <Name>Managed.Adb</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="dumpsys_package.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="printenv.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Content Include="test.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/SharpAdbClient.Tests/TcpSocketTests.cs b/SharpAdbClient.Tests/TcpSocketTests.cs
index ae82b9f7..bc9a93ab 100644
--- a/SharpAdbClient.Tests/TcpSocketTests.cs
+++ b/SharpAdbClient.Tests/TcpSocketTests.cs
@@ -58,22 +58,12 @@ public void BufferSizeTest()
             socket.Dispose();
         }
 
-        [TestMethod]
-        public void CreateSocketTest()
-        {
-            var winSocket = TcpSocket.CreateSocket(new IPEndPoint(IPAddress.Loopback, 0));
-            Assert.AreEqual(AddressFamily.InterNetwork, winSocket.AddressFamily);
-            Assert.AreEqual(SocketType.Stream, winSocket.SocketType);
-            Assert.AreEqual(ProtocolType.Tcp, winSocket.ProtocolType);
-
-            // Unix sockets cannot be created on Windows machines
-        }
-
         [TestMethod]
         [ExpectedException(typeof(NotSupportedException))]
         public void CreateUnsupportedSocketTest()
         {
-            TcpSocket.CreateSocket(new CustomEndPoint());
+            TcpSocket socket = new TcpSocket();
+            socket.Connect(new CustomEndPoint());
         }
     }
 }
diff --git a/appveyor.yml b/appveyor.yml
index 3cdc086b..1a91583b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,6 +18,12 @@ build_script:
   - cmd: dotnet build -c Release --version-suffix beta%APPVEYOR_BUILD_NUMBER%
   - cmd: dotnet pack -c Release --version-suffix beta%APPVEYOR_BUILD_NUMBER%
 
+test_script:
+  - cmd: cd ..\SharpAdbClient.Tests\
+  - cmd: dotnet restore
+  - cmd: dotnet build
+  - cmd: dotnet vstest bin\Debug\netcoreapp1.1\SharpAdbClient.Tests.dll /testcasefilter:TestCategory!=IntegrationTest /logger:Appveyor
+
 on_success:
   - ps: Push-AppveyorArtifact "bin\Release\SharpAdbClient.2.1.0-beta$($env:APPVEYOR_BUILD_NUMBER).nupkg"
   - ps: Push-AppveyorArtifact "bin\Release\SharpAdbClient.2.1.0-beta$($env:APPVEYOR_BUILD_NUMBER).symbols.nupkg"