diff --git a/DataProtection.sln b/DataProtection.sln
index b98012a3b3..f9c75589a5 100644
--- a/DataProtection.sln
+++ b/DataProtection.sln
@@ -22,10 +22,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataPr
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Abstractions.Test", "test\Microsoft.AspNetCore.DataProtection.Abstractions.Test\Microsoft.AspNetCore.DataProtection.Abstractions.Test.xproj", "{FF650A69-DEE4-4B36-9E30-264EE7CFB478}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Test.Shared", "test\Microsoft.AspNetCore.DataProtection.Test.Shared\Microsoft.AspNetCore.DataProtection.Test.Shared.xproj", "{4F14BA2A-4F04-4676-8586-EC380977EE2E}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Sources", "src\Microsoft.AspNetCore.DataProtection.Sources\Microsoft.AspNetCore.DataProtection.Sources.xproj", "{3277BB22-033F-4010-8131-A515B910CAAD}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.SystemWeb", "src\Microsoft.AspNetCore.DataProtection.SystemWeb\Microsoft.AspNetCore.DataProtection.SystemWeb.xproj", "{E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Extensions.Test", "test\Microsoft.AspNetCore.DataProtection.Extensions.Test\Microsoft.AspNetCore.DataProtection.Extensions.Test.xproj", "{04AA8E60-A053-4D50-89FE-E76C3DF45200}"
@@ -120,22 +116,6 @@ Global
 		{FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Release|x86.ActiveCfg = Release|Any CPU
 		{FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Release|x86.Build.0 = Release|Any CPU
-		{4F14BA2A-4F04-4676-8586-EC380977EE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F14BA2A-4F04-4676-8586-EC380977EE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F14BA2A-4F04-4676-8586-EC380977EE2E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4F14BA2A-4F04-4676-8586-EC380977EE2E}.Debug|x86.Build.0 = Debug|Any CPU
-		{4F14BA2A-4F04-4676-8586-EC380977EE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F14BA2A-4F04-4676-8586-EC380977EE2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F14BA2A-4F04-4676-8586-EC380977EE2E}.Release|x86.ActiveCfg = Release|Any CPU
-		{4F14BA2A-4F04-4676-8586-EC380977EE2E}.Release|x86.Build.0 = Release|Any CPU
-		{3277BB22-033F-4010-8131-A515B910CAAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3277BB22-033F-4010-8131-A515B910CAAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3277BB22-033F-4010-8131-A515B910CAAD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3277BB22-033F-4010-8131-A515B910CAAD}.Debug|x86.Build.0 = Debug|Any CPU
-		{3277BB22-033F-4010-8131-A515B910CAAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3277BB22-033F-4010-8131-A515B910CAAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3277BB22-033F-4010-8131-A515B910CAAD}.Release|x86.ActiveCfg = Release|Any CPU
-		{3277BB22-033F-4010-8131-A515B910CAAD}.Release|x86.Build.0 = Release|Any CPU
 		{E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -221,8 +201,6 @@ Global
 		{37053D5F-5B61-47CE-8B72-298CE007FFB0} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
 		{4B115BDE-B253-46A6-97BF-A8B37B344FF2} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
 		{FF650A69-DEE4-4B36-9E30-264EE7CFB478} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
-		{4F14BA2A-4F04-4676-8586-EC380977EE2E} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
-		{3277BB22-033F-4010-8131-A515B910CAAD} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
 		{E3552DEB-4173-43AE-BF69-3C10DFF3BAB6} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
 		{04AA8E60-A053-4D50-89FE-E76C3DF45200} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
 		{BF8681DB-C28B-441F-BD92-0DCFE9537A9F} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
diff --git a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json
index c8a739dd55..7aebe7cd35 100644
--- a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json
+++ b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json
@@ -2,10 +2,6 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Cryptography.Internal": "1.2.0-*",
-    "Microsoft.AspNetCore.DataProtection.Test.Shared": {
-      "type": "build",
-      "version": "1.0.0-*"
-    },
     "Microsoft.AspNetCore.Testing": "1.2.0-*",
     "xunit": "2.2.0-*"
   },
@@ -33,6 +29,7 @@
   "buildOptions": {
     "allowUnsafe": true,
     "keyFile": "../../tools/Key.snk",
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "compile": "../shared/*.cs"
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json
index 1050bd3a3d..f9fe27a02d 100644
--- a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json
+++ b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json
@@ -3,7 +3,6 @@
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Cryptography.Internal": "1.2.0-*",
     "Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.2.0-*",
-    "Microsoft.AspNetCore.DataProtection.Test.Shared": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.2.0-*",
     "xunit": "2.2.0-*"
   },
@@ -22,6 +21,7 @@
   "buildOptions": {
     "allowUnsafe": true,
     "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk",
+    "compile": "../shared/*.cs"
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json
index 5832651b11..77054cc9b0 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json
+++ b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json
@@ -3,10 +3,6 @@
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.DataProtection.Abstractions": "1.2.0-*",
     "Microsoft.AspNetCore.DataProtection.Extensions": "1.2.0-*",
-    "Microsoft.AspNetCore.DataProtection.Test.Shared": {
-      "type": "build",
-      "version": "1.0.0-*"
-    },
     "Microsoft.AspNetCore.Testing": "1.2.0-*",
     "Moq": "4.6.36-*",
     "xunit": "2.2.0-*"
@@ -26,6 +22,7 @@
   "testRunner": "xunit",
   "buildOptions": {
     "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk",
+    "compile": "../shared/*.cs"
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json b/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json
deleted file mode 100644
index 638fb6f242..0000000000
--- a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "frameworks": {
-    "netstandard1.1": {
-      "dependencies": {
-        "NETStandard.Library": "1.6.2-*"
-      }
-    }
-  },
-  "shared": "**/*.cs"
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Test/project.json
index 5d1947f2f4..d912776c79 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Test/project.json
+++ b/test/Microsoft.AspNetCore.DataProtection.Test/project.json
@@ -2,10 +2,6 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.DataProtection": "1.2.0-*",
-    "Microsoft.AspNetCore.DataProtection.Test.Shared": {
-      "type": "build",
-      "version": "1.0.0-*"
-    },
     "Microsoft.AspNetCore.Testing": "1.2.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.2.0-*",
     "Moq": "4.6.36-*",
@@ -27,6 +23,7 @@
   "buildOptions": {
     "allowUnsafe": true,
     "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk",
+    "compile": "../shared/*.cs"
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs b/test/shared/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.DataProtection.Test.Shared/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
rename to test/shared/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
diff --git a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/ConditionalRunTestOnlyWindowsAttribute.cs b/test/shared/ConditionalRunTestOnlyWindowsAttribute.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.DataProtection.Test.Shared/ConditionalRunTestOnlyWindowsAttribute.cs
rename to test/shared/ConditionalRunTestOnlyWindowsAttribute.cs
diff --git a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/ExceptionAssert2.cs b/test/shared/ExceptionAssert2.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.DataProtection.Test.Shared/ExceptionAssert2.cs
rename to test/shared/ExceptionAssert2.cs
diff --git a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/Microsoft.AspNetCore.DataProtection.Test.Shared.xproj b/test/shared/Microsoft.AspNetCore.DataProtection.Test.Shared.xproj
similarity index 100%
rename from test/Microsoft.AspNetCore.DataProtection.Test.Shared/Microsoft.AspNetCore.DataProtection.Test.Shared.xproj
rename to test/shared/Microsoft.AspNetCore.DataProtection.Test.Shared.xproj