diff --git a/BizHawk.sln b/BizHawk.sln
index 2067752ffe..380906593a 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -35,7 +35,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.WinForms.Controls",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{74391239-9BC1-40CE-A3D7-180737C5302A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Tests", "src\BizHawk.Tests\BizHawk.Tests.csproj", "{284E19E2-661D-4A7D-864A-AC2FC91E7C25}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Tests.Client.Common", "src\BizHawk.Tests.Client.Common\BizHawk.Tests.Client.Common.csproj", "{284E19E2-661D-4A7D-864A-AC2FC91E7C25}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Tests.Common", "src\BizHawk.Tests.Common\BizHawk.Tests.Common.csproj", "{39546396-C4D0-45D3-8C6A-D56D29B5BD72}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Tests.Emulation.Common", "src\BizHawk.Tests.Emulation.Common\BizHawk.Tests.Emulation.Common.csproj", "{D95E2B42-757A-4D19-8A76-84C6350BAD8D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -99,6 +103,14 @@ Global
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39546396-C4D0-45D3-8C6A-D56D29B5BD72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39546396-C4D0-45D3-8C6A-D56D29B5BD72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39546396-C4D0-45D3-8C6A-D56D29B5BD72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39546396-C4D0-45D3-8C6A-D56D29B5BD72}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D95E2B42-757A-4D19-8A76-84C6350BAD8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D95E2B42-757A-4D19-8A76-84C6350BAD8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D95E2B42-757A-4D19-8A76-84C6350BAD8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D95E2B42-757A-4D19-8A76-84C6350BAD8D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -112,6 +124,8 @@ Global
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 		{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25} = {74391239-9BC1-40CE-A3D7-180737C5302A}
+		{39546396-C4D0-45D3-8C6A-D56D29B5BD72} = {74391239-9BC1-40CE-A3D7-180737C5302A}
+		{D95E2B42-757A-4D19-8A76-84C6350BAD8D} = {74391239-9BC1-40CE-A3D7-180737C5302A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9B9E4316-9185-412E-B951-A63355ACA956}
diff --git a/src/BizHawk.Tests/Client.Common/Api/MemoryApiTests.cs b/src/BizHawk.Tests.Client.Common/Api/MemoryApiTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/Api/MemoryApiTests.cs
rename to src/BizHawk.Tests.Client.Common/Api/MemoryApiTests.cs
diff --git a/src/BizHawk.Tests/Client.Common/ArrayConversionTests.cs b/src/BizHawk.Tests.Client.Common/ArrayConversionTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/ArrayConversionTests.cs
rename to src/BizHawk.Tests.Client.Common/ArrayConversionTests.cs
diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests.Client.Common/BizHawk.Tests.Client.Common.csproj
similarity index 55%
rename from src/BizHawk.Tests/BizHawk.Tests.csproj
rename to src/BizHawk.Tests.Client.Common/BizHawk.Tests.Client.Common.csproj
index 96fa5239f9..647ce17e34 100644
--- a/src/BizHawk.Tests/BizHawk.Tests.csproj
+++ b/src/BizHawk.Tests.Client.Common/BizHawk.Tests.Client.Common.csproj
@@ -2,26 +2,15 @@
 	<PropertyGroup>
 		<TargetFramework>net48</TargetFramework>
 	</PropertyGroup>
-	<Import Project="../TestProjects.props" />
-	<PropertyGroup>
-		<DefineConstants Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">$(DefineConstants);SKIP_PLATFORM_TESTS</DefineConstants>
-		<MSTestAnalysisMode>All</MSTestAnalysisMode>
-		<RunSettingsFilePath>$(MSBuildProjectDirectory)/../MainSln.runsettings</RunSettingsFilePath>
-	</PropertyGroup>
+	<Import Project="../MainSlnTest.props" />
 	<ItemGroup>
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Tests.Common/BizHawk.Tests.Common.csproj" />
 		<Reference Include="NLua, Version=1.4.1.0, Culture=neutral, PublicKeyToken=null, processorArchitecture=MSIL" SpecificVersion="false" HintPath="$(ProjectDir)../../References/NLua.dll" Private="true" />
 		<None Include="$(ProjectDir)../../Assets/dll/lua54.dll" CopyToOutputDirectory="PreserveNewest" />
 		<!-- CHECKME: Does liblua5.4.so from a Linux host get picked up correctly? -->
 		<None Include="$(ProjectDir)../../Assets/dll/libbizhash.*" CopyToOutputDirectory="PreserveNewest" />
 		<None Include="$(ProjectDir)../../Assets/dll/libzstd.*" CopyToOutputDirectory="PreserveNewest" />
-		<Using Include="BizHawk.Tests" />
-	</ItemGroup>
-	<PropertyGroup>
-		<!-- Works around weird issue with IsExternalInit specifically, cause is likely related to https://github.com/Sergio0694/PolySharp/issues/48? -->
-		<PolySharpExcludeTypeForwardedToDeclarations>true</PolySharpExcludeTypeForwardedToDeclarations>
-	</PropertyGroup>
-	<ItemGroup>
 		<EmbeddedResource Include="data/**/*" />
 	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.Tests/Client.Common/Display/InputDisplayTests.cs b/src/BizHawk.Tests.Client.Common/Display/InputDisplayTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/Display/InputDisplayTests.cs
rename to src/BizHawk.Tests.Client.Common/Display/InputDisplayTests.cs
diff --git a/src/BizHawk.Tests/EmbeddedData.cs b/src/BizHawk.Tests.Client.Common/EmbeddedData.cs
similarity index 84%
rename from src/BizHawk.Tests/EmbeddedData.cs
rename to src/BizHawk.Tests.Client.Common/EmbeddedData.cs
index 1b6e24e357..0777208f9a 100644
--- a/src/BizHawk.Tests/EmbeddedData.cs
+++ b/src/BizHawk.Tests.Client.Common/EmbeddedData.cs
@@ -9,7 +9,7 @@ namespace BizHawk.Tests
 
 		public static Stream GetStream(string group, string embedPath)
 		{
-			var fullPath = $"BizHawk.Tests.data.{group}.{embedPath}";
+			var fullPath = $"BizHawk.Tests.Client.Common.data.{group}.{embedPath}";
 			return Asm.GetManifestResourceStream(fullPath) ?? throw new InvalidOperationException($"Could not find the embedded resource {fullPath}");
 		}
 	}
diff --git a/src/BizHawk.Tests/Client.Common/Movie/LogGeneratorTests.cs b/src/BizHawk.Tests.Client.Common/Movie/LogGeneratorTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/Movie/LogGeneratorTests.cs
rename to src/BizHawk.Tests.Client.Common/Movie/LogGeneratorTests.cs
diff --git a/src/BizHawk.Tests/Client.Common/Movie/MovieServiceTests.cs b/src/BizHawk.Tests.Client.Common/Movie/MovieServiceTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/Movie/MovieServiceTests.cs
rename to src/BizHawk.Tests.Client.Common/Movie/MovieServiceTests.cs
diff --git a/src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs b/src/BizHawk.Tests.Client.Common/Movie/ZwinderStateManagerTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs
rename to src/BizHawk.Tests.Client.Common/Movie/ZwinderStateManagerTests.cs
diff --git a/src/BizHawk.Tests/PlatformTests/Client.Common.movie/MovieConversionExtensionTests.cs b/src/BizHawk.Tests.Client.Common/PlatformTests/Client.Common.movie/MovieConversionExtensionTests.cs
similarity index 100%
rename from src/BizHawk.Tests/PlatformTests/Client.Common.movie/MovieConversionExtensionTests.cs
rename to src/BizHawk.Tests.Client.Common/PlatformTests/Client.Common.movie/MovieConversionExtensionTests.cs
diff --git a/src/BizHawk.Tests/Properties/AssemblyInfo.cs b/src/BizHawk.Tests.Client.Common/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/BizHawk.Tests/Properties/AssemblyInfo.cs
rename to src/BizHawk.Tests.Client.Common/Properties/AssemblyInfo.cs
diff --git a/src/BizHawk.Tests/Client.Common/cheats/CheatDecoderTests.cs b/src/BizHawk.Tests.Client.Common/cheats/CheatDecoderTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/cheats/CheatDecoderTests.cs
rename to src/BizHawk.Tests.Client.Common/cheats/CheatDecoderTests.cs
diff --git a/src/BizHawk.Tests/Client.Common/config/CorePickerStabilityTests.cs b/src/BizHawk.Tests.Client.Common/config/CorePickerStabilityTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/config/CorePickerStabilityTests.cs
rename to src/BizHawk.Tests.Client.Common/config/CorePickerStabilityTests.cs
diff --git a/src/BizHawk.Tests/Client.Common/config/SerializationStabilityTests.cs b/src/BizHawk.Tests.Client.Common/config/SerializationStabilityTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/config/SerializationStabilityTests.cs
rename to src/BizHawk.Tests.Client.Common/config/SerializationStabilityTests.cs
diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.7z b/src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.7z
similarity index 100%
rename from src/BizHawk.Tests/data/dearchive/m3_scy_change.7z
rename to src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.7z
diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.bsdtar.tar b/src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.bsdtar.tar
similarity index 100%
rename from src/BizHawk.Tests/data/dearchive/m3_scy_change.bsdtar.tar
rename to src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.bsdtar.tar
diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.gb b/src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.gb
similarity index 100%
rename from src/BizHawk.Tests/data/dearchive/m3_scy_change.gb
rename to src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.gb
diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.gb.gz b/src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.gb.gz
similarity index 100%
rename from src/BizHawk.Tests/data/dearchive/m3_scy_change.gb.gz
rename to src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.gb.gz
diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.gnutar.tar b/src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.gnutar.tar
similarity index 100%
rename from src/BizHawk.Tests/data/dearchive/m3_scy_change.gnutar.tar
rename to src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.gnutar.tar
diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.rar b/src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.rar
similarity index 100%
rename from src/BizHawk.Tests/data/dearchive/m3_scy_change.rar
rename to src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.rar
diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.zip b/src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.zip
similarity index 100%
rename from src/BizHawk.Tests/data/dearchive/m3_scy_change.zip
rename to src/BizHawk.Tests.Client.Common/data/dearchive/m3_scy_change.zip
diff --git a/src/BizHawk.Tests/data/dearchive/readme.md b/src/BizHawk.Tests.Client.Common/data/dearchive/readme.md
similarity index 100%
rename from src/BizHawk.Tests/data/dearchive/readme.md
rename to src/BizHawk.Tests.Client.Common/data/dearchive/readme.md
diff --git a/src/BizHawk.Tests/Client.Common/dearchive/DearchivalTests.cs b/src/BizHawk.Tests.Client.Common/dearchive/DearchivalTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/dearchive/DearchivalTests.cs
rename to src/BizHawk.Tests.Client.Common/dearchive/DearchivalTests.cs
diff --git a/src/BizHawk.Tests/Client.Common/lua/LuaTests.cs b/src/BizHawk.Tests.Client.Common/lua/LuaTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Client.Common/lua/LuaTests.cs
rename to src/BizHawk.Tests.Client.Common/lua/LuaTests.cs
diff --git a/src/BizHawk.Tests.Common/BizHawk.Tests.Common.csproj b/src/BizHawk.Tests.Common/BizHawk.Tests.Common.csproj
new file mode 100644
index 0000000000..87340d9319
--- /dev/null
+++ b/src/BizHawk.Tests.Common/BizHawk.Tests.Common.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net48</TargetFramework>
+	</PropertyGroup>
+	<Import Project="../MainSlnTest.props" />
+	<ItemGroup>
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/BizHawk.Tests/Common/CollectionExtensions/CollectionExtensionTests.cs b/src/BizHawk.Tests.Common/CollectionExtensions/CollectionExtensionTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Common/CollectionExtensions/CollectionExtensionTests.cs
rename to src/BizHawk.Tests.Common/CollectionExtensions/CollectionExtensionTests.cs
diff --git a/src/BizHawk.Tests/Common/CustomCollections/CustomCollectionTests.cs b/src/BizHawk.Tests.Common/CustomCollections/CustomCollectionTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Common/CustomCollections/CustomCollectionTests.cs
rename to src/BizHawk.Tests.Common/CustomCollections/CustomCollectionTests.cs
diff --git a/src/BizHawk.Tests/Common/EndiannessUtils/EndiannessUtilsTests.cs b/src/BizHawk.Tests.Common/EndiannessUtils/EndiannessUtilsTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Common/EndiannessUtils/EndiannessUtilsTests.cs
rename to src/BizHawk.Tests.Common/EndiannessUtils/EndiannessUtilsTests.cs
diff --git a/src/BizHawk.Tests/Common/MultiPredicateSort/MultiPredicateSortTests.cs b/src/BizHawk.Tests.Common/MultiPredicateSort/MultiPredicateSortTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Common/MultiPredicateSort/MultiPredicateSortTests.cs
rename to src/BizHawk.Tests.Common/MultiPredicateSort/MultiPredicateSortTests.cs
diff --git a/src/BizHawk.Tests/Common/NumberExtensions/NumberExtensionsTests.cs b/src/BizHawk.Tests.Common/NumberExtensions/NumberExtensionsTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Common/NumberExtensions/NumberExtensionsTests.cs
rename to src/BizHawk.Tests.Common/NumberExtensions/NumberExtensionsTests.cs
diff --git a/src/BizHawk.Tests/PlatformTests/Common.PathExtensions/PathExtensionTests.cs b/src/BizHawk.Tests.Common/PlatformTests/Common.PathExtensions/PathExtensionTests.cs
similarity index 100%
rename from src/BizHawk.Tests/PlatformTests/Common.PathExtensions/PathExtensionTests.cs
rename to src/BizHawk.Tests.Common/PlatformTests/Common.PathExtensions/PathExtensionTests.cs
diff --git a/src/BizHawk.Tests/PlatformTests/PlatformTestUtils.cs b/src/BizHawk.Tests.Common/PlatformTests/PlatformTestUtils.cs
similarity index 100%
rename from src/BizHawk.Tests/PlatformTests/PlatformTestUtils.cs
rename to src/BizHawk.Tests.Common/PlatformTests/PlatformTestUtils.cs
diff --git a/src/BizHawk.Tests.Common/Properties/AssemblyInfo.cs b/src/BizHawk.Tests.Common/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..300f5b1a74
--- /dev/null
+++ b/src/BizHawk.Tests.Common/Properties/AssemblyInfo.cs
@@ -0,0 +1 @@
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
diff --git a/src/BizHawk.Tests/Common/StringExtensions/NumericStringExtensionTests.cs b/src/BizHawk.Tests.Common/StringExtensions/NumericStringExtensionTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Common/StringExtensions/NumericStringExtensionTests.cs
rename to src/BizHawk.Tests.Common/StringExtensions/NumericStringExtensionTests.cs
diff --git a/src/BizHawk.Tests/Common/StringExtensions/StringExtensionTests.cs b/src/BizHawk.Tests.Common/StringExtensions/StringExtensionTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Common/StringExtensions/StringExtensionTests.cs
rename to src/BizHawk.Tests.Common/StringExtensions/StringExtensionTests.cs
diff --git a/src/BizHawk.Tests/TestAssertions.cs b/src/BizHawk.Tests.Common/TestAssertions.cs
similarity index 100%
rename from src/BizHawk.Tests/TestAssertions.cs
rename to src/BizHawk.Tests.Common/TestAssertions.cs
diff --git a/src/BizHawk.Tests/Common/checksums/CRC32Tests.cs b/src/BizHawk.Tests.Common/checksums/CRC32Tests.cs
similarity index 100%
rename from src/BizHawk.Tests/Common/checksums/CRC32Tests.cs
rename to src/BizHawk.Tests.Common/checksums/CRC32Tests.cs
diff --git a/src/BizHawk.Tests/Common/checksums/SHA1Tests.cs b/src/BizHawk.Tests.Common/checksums/SHA1Tests.cs
similarity index 100%
rename from src/BizHawk.Tests/Common/checksums/SHA1Tests.cs
rename to src/BizHawk.Tests.Common/checksums/SHA1Tests.cs
diff --git a/src/BizHawk.Tests/Emulation.Common/Base Implementations/MemoryCallbackSystemTests.cs b/src/BizHawk.Tests.Emulation.Common/Base Implementations/MemoryCallbackSystemTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Emulation.Common/Base Implementations/MemoryCallbackSystemTests.cs
rename to src/BizHawk.Tests.Emulation.Common/Base Implementations/MemoryCallbackSystemTests.cs
diff --git a/src/BizHawk.Tests.Emulation.Common/BizHawk.Tests.Emulation.Common.csproj b/src/BizHawk.Tests.Emulation.Common/BizHawk.Tests.Emulation.Common.csproj
new file mode 100644
index 0000000000..b60b791c93
--- /dev/null
+++ b/src/BizHawk.Tests.Emulation.Common/BizHawk.Tests.Emulation.Common.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net48</TargetFramework>
+	</PropertyGroup>
+	<Import Project="../MainSlnTest.props" />
+	<ItemGroup>
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Tests.Common/BizHawk.Tests.Common.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/BizHawk.Tests/Emulation.Common/Database/FirmwareDatabaseTests.cs b/src/BizHawk.Tests.Emulation.Common/Database/FirmwareDatabaseTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Emulation.Common/Database/FirmwareDatabaseTests.cs
rename to src/BizHawk.Tests.Emulation.Common/Database/FirmwareDatabaseTests.cs
diff --git a/src/BizHawk.Tests/Emulation.Common/Database/GameDBTSVParserTests.cs b/src/BizHawk.Tests.Emulation.Common/Database/GameDBTSVParserTests.cs
similarity index 100%
rename from src/BizHawk.Tests/Emulation.Common/Database/GameDBTSVParserTests.cs
rename to src/BizHawk.Tests.Emulation.Common/Database/GameDBTSVParserTests.cs
diff --git a/src/BizHawk.Tests.Emulation.Common/Properties/AssemblyInfo.cs b/src/BizHawk.Tests.Emulation.Common/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..300f5b1a74
--- /dev/null
+++ b/src/BizHawk.Tests.Emulation.Common/Properties/AssemblyInfo.cs
@@ -0,0 +1 @@
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
diff --git a/src/MainSlnCommon.props b/src/MainSlnCommon.props
index 21ab720447..fd228a44ae 100644
--- a/src/MainSlnCommon.props
+++ b/src/MainSlnCommon.props
@@ -24,6 +24,7 @@
 		<Analyzer Include="$(MSBuildProjectDirectory)/../../References/BizHawk.SrcGen.ReflectionCache.dll" />
 		<AdditionalFiles Include="$(MSBuildThisFileDirectory)/BannedSymbols.BannedApiAnalyzers.txt" />
 		<AdditionalFiles Include="$(MSBuildThisFileDirectory)/Menees.Analyzers.Settings.xml" />
+		<InternalsVisibleTo Include="$(MSBuildProjectName.Replace('BizHawk.', 'BizHawk.Tests.'))" />
 		<Using Include="System" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
diff --git a/src/MainSlnTest.props b/src/MainSlnTest.props
new file mode 100644
index 0000000000..6d1573dd77
--- /dev/null
+++ b/src/MainSlnTest.props
@@ -0,0 +1,15 @@
+<Project>
+	<Import Project="TestProjects.props" />
+	<PropertyGroup>
+		<DefineConstants Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">$(DefineConstants);SKIP_PLATFORM_TESTS</DefineConstants>
+		<MSTestAnalysisMode>All</MSTestAnalysisMode>
+		<RunSettingsFilePath>$(MSBuildProjectDirectory)/../MainSln.runsettings</RunSettingsFilePath>
+	</PropertyGroup>
+	<ItemGroup>
+		<Using Include="BizHawk.Tests" />
+	</ItemGroup>
+	<PropertyGroup>
+		<!-- Works around weird issue with IsExternalInit specifically, cause is likely related to https://github.com/Sergio0694/PolySharp/issues/48? -->
+		<PolySharpExcludeTypeForwardedToDeclarations>true</PolySharpExcludeTypeForwardedToDeclarations>
+	</PropertyGroup>
+</Project>