diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj
index 72aa8f95e4..89447a5c10 100644
--- a/src/BizHawk.Tests/BizHawk.Tests.csproj
+++ b/src/BizHawk.Tests/BizHawk.Tests.csproj
@@ -5,6 +5,7 @@
 	<Import Project="../TestProjects.props" />
 	<PropertyGroup>
 		<DefineConstants Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">$(DefineConstants);SKIP_PLATFORM_TESTS</DefineConstants>
+		<RunSettingsFilePath>$(MSBuildProjectDirectory)/../MainSln.runsettings</RunSettingsFilePath>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
diff --git a/src/MainSln.runsettings b/src/MainSln.runsettings
new file mode 100644
index 0000000000..cbcc17a7c4
--- /dev/null
+++ b/src/MainSln.runsettings
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+	<RunConfiguration>
+		<TestSessionTimeout>300000</TestSessionTimeout> <!-- milliseconds (300k = 5 min) -->
+		<TreatNoTestsAsError>true</TreatNoTestsAsError> <!-- there's an error message either way, but this makes it `exit(1)` -->
+	</RunConfiguration>
+</RunSettings>