diff --git a/src/OmniSharp.DotNetTest/VSTestManager.cs b/src/OmniSharp.DotNetTest/VSTestManager.cs
index 9e96ab2b25..5c7fe8113f 100644
--- a/src/OmniSharp.DotNetTest/VSTestManager.cs
+++ b/src/OmniSharp.DotNetTest/VSTestManager.cs
@@ -20,6 +20,8 @@ namespace OmniSharp.DotNetTest
 {
     internal class VSTestManager : TestManager
     {
+        private const string DefaultRunSettings = "<RunSettings />";
+
         public VSTestManager(Project project, string workingDirectory, DotNetCliService dotNetCli, IEventEmitter eventEmitter, ILoggerFactory loggerFactory)
             : base(project, workingDirectory, dotNetCli, eventEmitter, loggerFactory.CreateLogger<VSTestManager>())
         {
@@ -27,7 +29,7 @@ public VSTestManager(Project project, string workingDirectory, DotNetCliService
 
         protected override string GetCliTestArguments(int port, int parentProcessId)
         {
-            return $"vstest  --Port:{port} --ParentProcessId:{parentProcessId}";
+            return $"vstest --Port:{port} --ParentProcessId:{parentProcessId}";
         }
 
         protected override void VersionCheck()
@@ -86,7 +88,8 @@ public override GetTestStartInfoResponse GetTestStartInfo(string methodName, str
                 new
                 {
                     TestCases = testCases,
-                    DebuggingEnabled = true
+                    DebuggingEnabled = true,
+                    RunSettings = DefaultRunSettings
                 });
 
             var message = ReadMessage();
@@ -110,7 +113,8 @@ public override async Task<DebugTestGetStartInfoResponse> DebugGetStartInfoAsync
                 new
                 {
                     TestCases = testCases,
-                    DebuggingEnabled = true
+                    DebuggingEnabled = true,
+                    RunSettings = DefaultRunSettings
                 });
 
             var message = await ReadMessageAsync(cancellationToken);
@@ -170,7 +174,8 @@ public override RunTestResponse RunTest(string methodName, string testFrameworkN
                 SendMessage(MessageType.TestRunSelectedTestCasesDefaultHost,
                     new
                     {
-                        TestCases = testCases
+                        TestCases = testCases,
+                        RunSettings = DefaultRunSettings
                     });
 
                 var done = false;
@@ -224,7 +229,8 @@ private async Task<TestCase[]> DiscoverTestsAsync(string methodName, Cancellatio
                     Sources = new[]
                     {
                         Project.OutputFilePath
-                    }
+                    },
+                    RunSettings = DefaultRunSettings
                 });
 
             var testCases = new List<TestCase>();
diff --git a/test-assets/test-projects/NUnitTestProject/NUnitTestProject.csproj b/test-assets/test-projects/NUnitTestProject/NUnitTestProject.csproj
index def8e83369..cf85e2121e 100644
--- a/test-assets/test-projects/NUnitTestProject/NUnitTestProject.csproj
+++ b/test-assets/test-projects/NUnitTestProject/NUnitTestProject.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="NUnit" Version="3.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0-ci-00452-pr-313" />
   </ItemGroup>
 
 </Project>
diff --git a/test-assets/test-projects/NUnitTestProject/NuGet.config b/test-assets/test-projects/NUnitTestProject/NuGet.config
new file mode 100644
index 0000000000..4da3f8ba7e
--- /dev/null
+++ b/test-assets/test-projects/NUnitTestProject/NuGet.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="AppVeyor NUnit CI Feed" value="https://ci.appveyor.com/nuget/nunit" />
+    <add key="AppVeyor NUnit Engine CI Feed" value="https://ci.appveyor.com/nuget/nunit-console" />
+    <add key="AppVeyor NUnit Adapter CI Feed" value="https://ci.appveyor.com/nuget/nunit3-vs-adapter" />
+    <add key="NUnit MyGet Feed" value="https://www.myget.org/F/nunit/api/v2" />
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs
index 1fd0705ea1..fc52e02c59 100644
--- a/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs
+++ b/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs
@@ -13,7 +13,7 @@ public abstract class AbstractRunTestFacts : AbstractTestFixture
         protected const string LegacyXunitTestProject = "LegacyXunitTestProject";
         protected const string LegacyNunitTestProject = "LegacyNunitTestProject";
         protected const string XunitTestProject = "XunitTestProject";
-        protected const string NunitTestProject = "NunitTestProject";
+        protected const string NUnitTestProject = "NUnitTestProject";
 
         public AbstractRunTestFacts(ITestOutputHelper testOutput)
             : base(testOutput)
diff --git a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
index d588e6d0f2..01218d9884 100644
--- a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
+++ b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
@@ -65,44 +65,41 @@ public async Task RunXunitTestWithSimilarName()
             Assert.Equal(1, response.Results.Length);
         }
 
-        // NUnit does not work with .NET CLI RTM yet. https://github.com/nunit/dotnet-test-nunit/issues/108
-        // When it does, the NUnitTestProject should be updated and the tests below re-enabled.
-
-        //[Fact]
+        [Fact]
         public async Task RunNunitTest()
         {
             await RunDotNetTestAsync(
-                NunitTestProject,
+                NUnitTestProject,
                 methodName: "Main.Test.MainTest.Test",
                 testFramework: "nunit",
                 shouldPass: true);
         }
 
-        //[Fact]
+        [Fact]
         public async Task RunNunitDataDriveTest1()
         {
             await RunDotNetTestAsync(
-                NunitTestProject,
+                NUnitTestProject,
                 methodName: "Main.Test.MainTest.DataDrivenTest1",
                 testFramework: "nunit",
                 shouldPass: false);
         }
 
-        //[Fact]
+        [Fact]
         public async Task RunNunitDataDriveTest2()
         {
             await RunDotNetTestAsync(
-                NunitTestProject,
+                NUnitTestProject,
                 methodName: "Main.Test.MainTest.DataDrivenTest2",
                 testFramework: "nunit",
                 shouldPass: true);
         }
 
-        //[Fact]
+        [Fact]
         public async Task RunNunitSourceDataDrivenTest()
         {
             await RunDotNetTestAsync(
-                NunitTestProject,
+                NUnitTestProject,
                 methodName: "Main.Test.MainTest.SourceDataDrivenTest",
                 testFramework: "nunit",
                 shouldPass: true);