diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index be6d9b98507e549a14e2cf977ac106735d7c29ea..83badbb92673695be5ef5f9667f997b432cff58e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -54,6 +54,18 @@ jobs:
       name: Build
       displayName: Build
       condition: succeeded()
+    - script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 -warnaserror:0 -ci
+        eng/sendToHelix.proj
+        /t:Test
+        /p:TestOS=Windows_NT
+        /p:Configuration=$(_BuildConfig)
+        /p:HelixBuild=$(Build.BuildNumber)
+        /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
+        /p:HelixAccessToken=$(HelixApiAccessToken)
+      displayName: Send to Helix
+      condition: succeeded()
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     - task: PublishBuildArtifacts@1
       displayName: Publish Windows managed assets
       inputs:
@@ -147,6 +159,7 @@ jobs:
     - script: ./eng/common/msbuild.sh --warnaserror false --ci
         eng/sendToHelix.proj
         /t:Test
+        /p:TestOS=Unix
         /p:Configuration=$(_BuildConfig)
         /p:HelixBuild=$(Build.BuildNumber)
         /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
diff --git a/eng/sendToHelix.proj b/eng/sendToHelix.proj
index cfb3d72bdff23ea82b4e85345f1839e7b9d586d6..b45cb01b3ec8bd34a46fce87de097ad86a879ae9 100644
--- a/eng/sendToHelix.proj
+++ b/eng/sendToHelix.proj
@@ -1,13 +1,18 @@
 <Project Sdk="Microsoft.DotNet.Helix.Sdk">
   <PropertyGroup>
-    <HelixSource>pr/dotnet/iot/$(BUILD_SOURCEBRANCH)/</HelixSource>
+    <TestOS Condition="'$(TestOS)' == ''">$(OS)</TestOS>
+    <HelixSourcePrefix>pr</HelixSourcePrefix>
+    <HelixSourcePrefix Condition="'$(HelixAccessToken)' != ''">official</HelixSourcePrefix>
+    <HelixSource>$(HelixSourcePrefix)/dotnet/iot/$(BUILD_SOURCEBRANCH)/</HelixSource>
     <HelixType>test/product/</HelixType>
     <HelixBuild>$(BUILD_BUILDNUMBER)</HelixBuild>
     <HelixBuild Condition="'$(HelixBuild)' == ''">123460.01</HelixBuild>
     <HelixConfiguration>$(Configuration)</HelixConfiguration>
+    <XUnitArguments>$(XUnitArguments) -nocolor -verbose -serialize -maxthreads 1</XUnitArguments>
 
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <DotNetCliVersion>2.2.300</DotNetCliVersion>
 
     <EnableAzurePipelinesReporter Condition="'$(SYSTEM_ACCESSTOKEN)' != ''">true</EnableAzurePipelinesReporter>
     <TestRunNamePrefix>$(AGENT_JOBNAME)</TestRunNamePrefix>
@@ -16,36 +21,53 @@
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!-- For now we only have a queue for Linux. Once we have a queue for Windows we will run 
-    those tests too. -->
+  <PropertyGroup Condition=" '$(HelixAccessToken)' == '' ">
+    <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator>
+    <Creator Condition=" '$(Creator)' == ''">dotnet-bot</Creator>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(HelixTargetQueue)' != ''">
+    <HelixTargetQueue Include="$(HelixTargetQueue)"/>
+  </ItemGroup>
+
+  <!-- Windows-specific settings -->
+  <ItemGroup Condition="'$(TestOS)' == 'Windows_NT'">
+    <!-- Xunit project to test -->
     <XUnitProject Include="..\src\System.Device.Gpio.Tests\System.Device.Gpio.Tests.csproj">
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RuntimeTargetFramework>netcoreapp2.0</RuntimeTargetFramework>
-      <AdditionalProperties>RuntimeIdentifier=linux-arm</AdditionalProperties>
+      <AdditionalProperties>RuntimeIdentifier=win-arm</AdditionalProperties>
     </XUnitProject>
+    <!-- Target queues -->
+    <HelixTargetQueue Condition="'$(HelixAccessToken)' != ''" Include="Windows.10.Arm32.IoT"/>
+    <HelixTargetQueue Condition="'$(HelixAccessToken)' == ''" Include="Windows.10.Arm32.IoT.Open"/>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(HelixAccessToken)' != '' And '$(HelixTargetQueue)' == ''">
-    <HelixTargetQueue Include="Raspbian.9.Arm32.IoT"/>
-  </ItemGroup>
+  <PropertyGroup Condition="'$(TestOS)' == 'Windows_NT'">
+    <DotNetCliRuntime>win-arm</DotNetCliRuntime>
+    <XUnitArguments>$(XUnitArguments) -notrait "SkipOnTestRun=Windows_NT"</XUnitArguments>
+  </PropertyGroup>
 
-  <ItemGroup Condition="'$(HelixTargetQueue)' != ''">
-    <HelixTargetQueue Include="$(HelixTargetQueue)"/>
+  <!-- Linux-specific settings -->
+  <ItemGroup Condition="'$(TestOS)' == 'Unix'">
+    <!-- Xunit project to test -->
+    <XUnitProject Include="..\src\System.Device.Gpio.Tests\System.Device.Gpio.Tests.csproj">
+      <TargetFramework>netcoreapp2.1</TargetFramework>
+      <RuntimeTargetFramework>netcoreapp2.0</RuntimeTargetFramework>
+      <AdditionalProperties>RuntimeIdentifier=linux-arm</AdditionalProperties>
+    </XUnitProject>
+    <!-- Target queues -->
+    <HelixTargetQueue Condition="'$(HelixAccessToken)' != ''" Include="Raspbian.9.Arm32.IoT"/>
+    <HelixTargetQueue Condition="'$(HelixAccessToken)' == ''" Include="Raspbian.9.Arm32.IoT.Open"/>
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(HelixAccessToken)' == '' ">
-    <IsExternal>true</IsExternal>
-    <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator>
-    <Creator Condition=" '$(Creator)' == ''">dotnet-bot</Creator>
+  <PropertyGroup Condition="'$(TestOS)' == 'Unix'">
+    <XUnitArguments>$(XUnitArguments) -notrait "SkipOnTestRun=Unix"</XUnitArguments>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(HelixAccessToken)' == '' And '$(HelixTargetQueue)' == ''">
-    <HelixTargetQueue Include="Raspbian.9.Arm32.IoT.open"/>
-  </ItemGroup>
-
-  <!-- Our tests require to run as elevated. -->
+  <!-- Our Unix tests require to run as elevated. -->
   <Target Name="AppendSudoToHelixWorkItems"
+          Condition="'$(TestOS)' == 'Unix'"
           Inputs="%(HelixWorkItem.Identity)%(HelixWorkItem.Command)"
           Outputs="unused"
           AfterTargets="CreateXUnitWorkItems">
@@ -56,7 +78,7 @@
       <!-- Pre append sudo and the full path to dotnet to the command, along with a dollarsign throwAway
       which will remove the initial dotnet from the helix command as it will be interpreted as a
       variable -->
-      <_newCommand>sudo -E $_dotnet $throwAway%(HelixWorkItem.Command) -verbose -serialize -maxthreads 1</_newCommand>
+      <_newCommand>sudo -E $_dotnet $throwAway%(HelixWorkItem.Command)</_newCommand>
     </PropertyGroup>
     <ItemGroup>
       <HelixWorkItem>
diff --git a/src/System.Device.Gpio.Tests/GpioControllerTestBase.cs b/src/System.Device.Gpio.Tests/GpioControllerTestBase.cs
index 210105baf7f844646bace9741d77ce008db2d2dc..230b192f813042a8a005c2ac65f95f3a879b8dcd 100644
--- a/src/System.Device.Gpio.Tests/GpioControllerTestBase.cs
+++ b/src/System.Device.Gpio.Tests/GpioControllerTestBase.cs
@@ -31,6 +31,7 @@ namespace System.Device.Gpio.Tests
         }
 
         [Fact]
+        [Trait("SkipOnTestRun", "Windows_NT")] // The WindowsDriver is kept as High when disposed.
         public void PinValueReturnsToLowAfterDispose()
         {
             using (GpioController controller = new GpioController(GetTestNumberingScheme(), GetTestDriver()))
@@ -116,6 +117,7 @@ namespace System.Device.Gpio.Tests
         }
 
         [Fact]
+        [Trait("SkipOnTestRun", "Windows_NT")] // Currently, the Windows Driver is defaulting to InputPullDown instead of Input when Closed/Opened.
         public void OpenPinDefaultsModeToInput()
         {
             using (GpioController controller = new GpioController(GetTestNumberingScheme(), GetTestDriver()))
@@ -272,6 +274,7 @@ namespace System.Device.Gpio.Tests
         }
 
         [Fact]
+        [Trait("SkipOnTestRun", "Windows_NT")] // The windows driver is returning none as the event type.
         public void WaitForEventCancelAfter10MilliSecondsTest()
         {
             using (GpioController controller = new GpioController(GetTestNumberingScheme(), GetTestDriver()))
diff --git a/src/System.Device.Gpio.Tests/System.Device.Gpio.Tests.csproj b/src/System.Device.Gpio.Tests/System.Device.Gpio.Tests.csproj
index bd84a9c66cc810fb4978dd5ccd0fc2b234347e84..f0146f56b776f7ca214f5f860f3652aa91d058fa 100644
--- a/src/System.Device.Gpio.Tests/System.Device.Gpio.Tests.csproj
+++ b/src/System.Device.Gpio.Tests/System.Device.Gpio.Tests.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <!-- Make sure that we copy the native shim to the publish directory before sending the tests to Helix -->
-  <Target Name="AddNativeShimToCopyToPublishDirectory" BeforeTargets="_ComputeResolvedFilesToPublishTypes">
+  <Target Name="AddNativeShimToCopyToPublishDirectory" Condition="'$(TargetsLinux)' == 'true'" BeforeTargets="_ComputeResolvedFilesToPublishTypes">
     <ItemGroup>
       <_nativeShimFiles Include="$(ArtifactsBinDir)Native\$(Configuration)\*.*" />
 
diff --git a/src/System.Device.Gpio.Tests/WindowsDriverTests.Windows.cs b/src/System.Device.Gpio.Tests/WindowsDriverTests.Windows.cs
index d3b04ad09dff9c917a2104b1446bc46166f8942b..147990e9dfabf2c73d4f8863f4e7e861a03e3643 100644
--- a/src/System.Device.Gpio.Tests/WindowsDriverTests.Windows.cs
+++ b/src/System.Device.Gpio.Tests/WindowsDriverTests.Windows.cs
@@ -6,7 +6,7 @@ using System.Device.Gpio.Drivers;
 
 namespace System.Device.Gpio.Tests
 {
-    class WindowsDriverTests : GpioControllerTestBase
+    public class WindowsDriverTests : GpioControllerTestBase
     {
         protected override GpioDriver GetTestDriver() => new Windows10Driver();