diff --git a/src/Microsoft.PowerShell.Linux.UnitTests/project.json b/src/Microsoft.PowerShell.Linux.UnitTests/project.json
new file mode 100644
index 0000000000..c59bb29bda
--- /dev/null
+++ b/src/Microsoft.PowerShell.Linux.UnitTests/project.json
@@ -0,0 +1,26 @@
+{
+    "version": "1.0.0.0",
+    "description": "PowerShell On Linux xUnit Tests",
+    "authors": [ "andschwa" ],
+    "tags": [ "" ],
+    "projectUrl": "",
+    "licenseUrl": "",
+
+    "dependencies": {
+        "System.Management.Automation": "",
+        "Microsoft.PowerShell.Security": "",
+        "Microsoft.PowerShell.Commands.Utility": "",
+        "Microsoft.PowerShell.Commands.Management": "",
+	"xunit": "2.1.0-*",
+        "xunit.runner.dnx": "2.1.0-*"
+    },
+
+    "commands": {
+	"test": "xunit.runner.dnx"
+    },
+
+    "frameworks": {
+        "dnxcore50": {
+        }
+    }
+}
diff --git a/src/xunit-tests/test_Binders.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_Binders.cs
similarity index 100%
rename from src/xunit-tests/test_Binders.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_Binders.cs
diff --git a/src/xunit-tests/test_CorePsExtensions.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_CorePsExtensions.cs
similarity index 100%
rename from src/xunit-tests/test_CorePsExtensions.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_CorePsExtensions.cs
diff --git a/src/xunit-tests/test_CorePsPlatform.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_CorePsPlatform.cs
similarity index 100%
rename from src/xunit-tests/test_CorePsPlatform.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_CorePsPlatform.cs
diff --git a/src/xunit-tests/test_ExtensionMethods.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_ExtensionMethods.cs
similarity index 100%
rename from src/xunit-tests/test_ExtensionMethods.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_ExtensionMethods.cs
diff --git a/src/xunit-tests/test_FileSystemProvider.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_FileSystemProvider.cs
similarity index 100%
rename from src/xunit-tests/test_FileSystemProvider.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_FileSystemProvider.cs
diff --git a/src/xunit-tests/test_MshSnapinInfo.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_MshSnapinInfo.cs
similarity index 100%
rename from src/xunit-tests/test_MshSnapinInfo.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_MshSnapinInfo.cs
diff --git a/src/xunit-tests/test_PSVersionInfo.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_PSVersionInfo.cs
similarity index 100%
rename from src/xunit-tests/test_PSVersionInfo.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_PSVersionInfo.cs
diff --git a/src/xunit-tests/test_Runspace.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_Runspace.cs
similarity index 100%
rename from src/xunit-tests/test_Runspace.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_Runspace.cs
diff --git a/src/xunit-tests/test_SecuritySupport.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_SecuritySupport.cs
similarity index 100%
rename from src/xunit-tests/test_SecuritySupport.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_SecuritySupport.cs
diff --git a/src/xunit-tests/test_Utils.cs b/src/Microsoft.PowerShell.Linux.UnitTests/test_Utils.cs
similarity index 100%
rename from src/xunit-tests/test_Utils.cs
rename to src/Microsoft.PowerShell.Linux.UnitTests/test_Utils.cs
diff --git a/src/xunit-tests/xunit-tests.mk b/src/xunit-tests/xunit-tests.mk
deleted file mode 100644
index b99bee7743..0000000000
--- a/src/xunit-tests/xunit-tests.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# xUnit tests for PowerShell
-# - results in xunit-tests.xml
-# - see https://xunit.github.io/
-TEST_FOLDER=$(MONAD)/src/xunit-tests
-TEST_SRCS=$(TEST_FOLDER)/test_*.cs
-TEST_TARGETS=$(addprefix $(PSLIB)/, System.Management.Automation.dll Microsoft.PowerShell.Commands.Management.dll)
-
-$(PSLIB)/PowerShell.Linux.Test.dll: $(TEST_SRCS) $(TEST_TARGETS)
-	$(CSC) $(CSCOPTS_LIB) -out:$@ $(addprefix -r:$(MONAD_EXT)/xunit/, xunit.core.dll xunit.assert.dll) $(addprefix -r:, $(TEST_TARGETS)) $(COREREF) $(TEST_SRCS)
-
-test: $(PSLIB)/PowerShell.Linux.Test.dll
-	$(POWERSHELL) $(PSLIB)/xunit.console.netcore.exe $< -xml $(MONAD)/xunit-tests.xml