diff --git a/scripts/configuration/testProjects.csv b/scripts/configuration/testProjects.csv
index 74fafd179..3e70cd4d7 100644
--- a/scripts/configuration/testProjects.csv
+++ b/scripts/configuration/testProjects.csv
@@ -5,3 +5,4 @@ dotnet-compile.UnitTests
 dotnet-build.Tests
 Microsoft.DotNet.Cli.Utils.Tests
 Microsoft.DotNet.Compiler.Common.Tests
+ArgumentForwardingTests
\ No newline at end of file
diff --git a/scripts/configuration/testScripts.csv b/scripts/configuration/testScripts.csv
index 6ce784583..bd42a3352 100644
--- a/scripts/configuration/testScripts.csv
+++ b/scripts/configuration/testScripts.csv
@@ -1,2 +1 @@
-argument-forwarding-tests
 package-command-test
\ No newline at end of file
diff --git a/scripts/test/argument-forwarding-tests.ps1 b/scripts/test/argument-forwarding-tests.ps1
deleted file mode 100644
index 8461f2ac8..000000000
--- a/scripts/test/argument-forwarding-tests.ps1
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-. "$PSScriptRoot\..\common\_common.ps1"
-
-$ArgTestRoot = "$RepoRoot\test\ArgumentForwardingTests"
-$ArgTestOutputRoot = "$RepoRoot\artifacts\tests\arg-forwarding"
-
-dotnet publish --framework "dnxcore50" --runtime "$Rid" --output "$ArgTestOutputRoot" --configuration "$Configuration" "$ArgTestRoot\Reflector"
-if (!$?) {
-    Write-Host Command failed: dotnet publish --framework "dnxcore50" --runtime "$Rid" --output "$ArgTestOutputRoot" --configuration "$Configuration" "$ArgTestRoot\Reflector"
-    Exit 1
-}
-
-dotnet publish --framework "dnxcore50" --runtime "$Rid" --output "$ArgTestOutputRoot" --configuration "$Configuration" "$ArgTestRoot\ArgumentForwardingTests"
-if (!$?) {
-    Write-Host Command failed: dotnet publish --framework "dnxcore50" --runtime "$Rid" --output "$ArgTestOutputRoot" --configuration "$Configuration" "$ArgTestRoot\ArgumentForwardingTests"
-    Exit 1
-}
-
-cp "$ArgTestRoot\Reflector\reflector_cmd.cmd" "$ArgTestOutputRoot"
-
-pushd "$ArgTestOutputRoot"
-
-& ".\corerun" "xunit.console.netcore.exe" "ArgumentForwardingTests.dll" -xml "$_-testResults.xml" -notrait category=failing
-$exitCode = $LastExitCode
-
-popd
-
-# No need to output here, we'll get test results
-if ($exitCode -ne 0) {
-    Exit 1
-}
\ No newline at end of file
diff --git a/scripts/test/argument-forwarding-tests.sh b/scripts/test/argument-forwarding-tests.sh
deleted file mode 100755
index 069683a35..000000000
--- a/scripts/test/argument-forwarding-tests.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-set -e
-
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-source "$DIR/../common/_common.sh"
-
-ArgTestRoot="$REPOROOT/test/ArgumentForwardingTests"
-ArgTestOutputRoot="$REPOROOT/artifacts/tests/arg-forwarding"
-
-dotnet publish --framework "dnxcore50" --output "$ArgTestOutputRoot" --configuration "$CONFIGURATION" "$ArgTestRoot/Reflector"
-dotnet publish --framework "dnxcore50" --output "$ArgTestOutputRoot" --configuration "$CONFIGURATION" "$ArgTestRoot/ArgumentForwardingTests"
-
-
-
-pushd "$ArgTestOutputRoot"
-    ./corerun "xunit.console.netcore.exe" "ArgumentForwardingTests.dll" -xml "ArgumentForwardingTests-testResults.xml" -notrait category=failing
-popd
diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests/ArgumentForwardingTests.cs b/test/ArgumentForwardingTests/ArgumentForwardingTests.cs
similarity index 96%
rename from test/ArgumentForwardingTests/ArgumentForwardingTests/ArgumentForwardingTests.cs
rename to test/ArgumentForwardingTests/ArgumentForwardingTests.cs
index 4b4bb1614..8834625af 100644
--- a/test/ArgumentForwardingTests/ArgumentForwardingTests/ArgumentForwardingTests.cs
+++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.cs
@@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
 {
     public class ArgumentForwardingTests : TestBase
     {
-        private static readonly string s_reflectorExeName = "Reflector" + Constants.ExeSuffix;
+        private static readonly string s_reflectorExeName = "ArgumentsReflector" + Constants.ExeSuffix;
         private static readonly string s_reflectorCmdName = "reflector_cmd";
 
         private string ReflectorPath { get; set; }
@@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
         {
             Console.WriteLine("Dummy Entrypoint.");
         }
-       
+
         public ArgumentForwardingTests()
         {
             // This test has a dependency on an argument reflector
@@ -135,7 +135,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
             {
                 var rawArg = rawEvaluatedArgument[i];
                 var escapedArg = escapedEvaluatedRawArgument[i];
-                
+
                 try
                 {
                     rawArg.Should().Be(escapedArg);
@@ -175,7 +175,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
         /// <summary>
         /// EscapeAndEvaluateArgumentString returns a representation of string[] args
         /// when rawEvaluatedArgument is passed as an argument to a process using
-        /// Command.Create(). Ideally this should escape the argument such that 
+        /// Command.Create(). Ideally this should escape the argument such that
         /// the output is == rawEvaluatedArgument.
         /// </summary>
         /// <param name="rawEvaluatedArgument">A string[] representing string[] args as already evaluated by a process</param>
@@ -195,7 +195,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
         /// <summary>
         /// EscapeAndEvaluateArgumentString returns a representation of string[] args
         /// when rawEvaluatedArgument is passed as an argument to a process using
-        /// Command.Create(). Ideally this should escape the argument such that 
+        /// Command.Create(). Ideally this should escape the argument such that
         /// the output is == rawEvaluatedArgument.
         /// </summary>
         /// <param name="rawEvaluatedArgument">A string[] representing string[] args as already evaluated by a process</param>
@@ -218,7 +218,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
 
         /// <summary>
         /// Parse the output of the reflector into a string array.
-        /// Reflector output is simply string[] args written to 
+        /// Reflector output is simply string[] args written to
         /// one string separated by commas.
         /// </summary>
         /// <param name="reflectorOutput"></param>
@@ -230,7 +230,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
 
         /// <summary>
         /// Parse the output of the reflector into a string array.
-        /// Reflector output is simply string[] args written to 
+        /// Reflector output is simply string[] args written to
         /// one string separated by commas.
         /// </summary>
         /// <param name="reflectorOutput"></param>
@@ -262,7 +262,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
             {
                 StartInfo = new ProcessStartInfo
                 {
-                    FileName = s_reflectorExeName,
+                    FileName = ReflectorPath,
                     Arguments = testUserArgument,
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests/ArgumentForwardingTests.xproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.xproj
similarity index 100%
rename from test/ArgumentForwardingTests/ArgumentForwardingTests/ArgumentForwardingTests.xproj
rename to test/ArgumentForwardingTests/ArgumentForwardingTests.xproj
diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json
deleted file mode 100644
index e895933c4..000000000
--- a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "version": "1.0.0-*",
-    "compilationOptions": {
-        "emitEntryPoint": true
-    },
-
-    "dependencies": {
-        "NETStandard.Library" : "1.0.0-rc2-23811",
-        "Microsoft.NETCore.TestHost": "1.0.0-rc2-23811",
-
-        "xunit": "2.1.0",
-        "xunit.console.netcore": "1.0.2-prerelease-00101",
-        "xunit.netcore.extensions": "1.0.0-prerelease-00153",
-        "xunit.runner.utility": "2.1.0",
-
-        "Microsoft.DotNet.ProjectModel": { "target": "project" },
-        "Microsoft.DotNet.Cli.Utils": { "target": "project" },
-        "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }
-    },
-
-    "frameworks": {
-        "dnxcore50": {
-            "imports": "portable-net45+win8"
-        }
-    }
-}
diff --git a/test/ArgumentForwardingTests/Reflector/project.json b/test/ArgumentForwardingTests/project.json
similarity index 67%
rename from test/ArgumentForwardingTests/Reflector/project.json
rename to test/ArgumentForwardingTests/project.json
index e895933c4..19d7b3954 100644
--- a/test/ArgumentForwardingTests/Reflector/project.json
+++ b/test/ArgumentForwardingTests/project.json
@@ -6,21 +6,22 @@
 
     "dependencies": {
         "NETStandard.Library" : "1.0.0-rc2-23811",
-        "Microsoft.NETCore.TestHost": "1.0.0-rc2-23811",
-
-        "xunit": "2.1.0",
-        "xunit.console.netcore": "1.0.2-prerelease-00101",
-        "xunit.netcore.extensions": "1.0.0-prerelease-00153",
-        "xunit.runner.utility": "2.1.0",
 
         "Microsoft.DotNet.ProjectModel": { "target": "project" },
         "Microsoft.DotNet.Cli.Utils": { "target": "project" },
-        "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }
+        "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
+
+        "xunit": "2.1.0",
+        "dotnet-test-xunit": "1.0.0-dev-48273-16"
     },
 
     "frameworks": {
         "dnxcore50": {
             "imports": "portable-net45+win8"
         }
-    }
+    },
+
+    "testRunner": "xunit",
+
+    "scripts": { "precompile": "dotnet build ../ArgumentsReflector/project.json --framework dnxcore50 --output %compile:RuntimeOutputDir%" }
 }
diff --git a/test/ArgumentForwardingTests/Reflector/Reflector.cs b/test/ArgumentsReflector/Reflector.cs
similarity index 66%
rename from test/ArgumentForwardingTests/Reflector/Reflector.cs
rename to test/ArgumentsReflector/Reflector.cs
index 1af26f716..4176ebb0d 100644
--- a/test/ArgumentForwardingTests/Reflector/Reflector.cs
+++ b/test/ArgumentsReflector/Reflector.cs
@@ -2,17 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using Xunit;
-using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.ProjectModel;
-using Microsoft.DotNet.Tools.Test.Utilities;
-using Microsoft.Extensions.PlatformAbstractions;
-using System.Diagnostics;
-using FluentAssertions;
 
 namespace Microsoft.DotNet.Tests.ArgumentForwarding
 {
diff --git a/test/ArgumentForwardingTests/Reflector/Reflector.xproj b/test/ArgumentsReflector/Reflector.xproj
similarity index 100%
rename from test/ArgumentForwardingTests/Reflector/Reflector.xproj
rename to test/ArgumentsReflector/Reflector.xproj
diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json
new file mode 100644
index 000000000..e2dc63e05
--- /dev/null
+++ b/test/ArgumentsReflector/project.json
@@ -0,0 +1,18 @@
+{
+    "version": "1.0.0-*",
+    "compilationOptions": {
+        "emitEntryPoint": true
+    },
+
+    "dependencies": {
+        "NETStandard.Library" : "1.0.0-rc2-23811"
+    },
+
+    "frameworks": {
+        "dnxcore50": {
+            "imports": "portable-net45+win8"
+        }
+    },
+
+    "content": ["reflector_cmd.cmd"]
+}
diff --git a/test/ArgumentForwardingTests/Reflector/reflector_cmd.cmd b/test/ArgumentsReflector/reflector_cmd.cmd
similarity index 100%
rename from test/ArgumentForwardingTests/Reflector/reflector_cmd.cmd
rename to test/ArgumentsReflector/reflector_cmd.cmd