diff --git a/demo/FakeItEasy/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj b/demo/FakeItEasy/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj
index 150345a8..3a5bd8a3 100644
--- a/demo/FakeItEasy/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj
+++ b/demo/FakeItEasy/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj
@@ -15,8 +15,8 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
 		<PackageReference Include="coverlet.collector" Version="6.0.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/demo/Moq/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj b/demo/Moq/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj
index 18a85a1a..5fe38acd 100644
--- a/demo/Moq/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj
+++ b/demo/Moq/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj
@@ -11,8 +11,8 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
 		<PackageReference Include="coverlet.collector" Version="6.0.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/demo/NSubstitute/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj b/demo/NSubstitute/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj
index 481e11fb..a9a78f4e 100644
--- a/demo/NSubstitute/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj
+++ b/demo/NSubstitute/Tethos.MSTest.Demo/Tethos.MSTest.Demo.csproj
@@ -11,8 +11,8 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
 		<PackageReference Include="coverlet.collector" Version="6.0.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/test/EndToEnd/FakeItEasy/Tethos.FakeItEasy.MSTest.EndToEnd/Tethos.FakeItEasy.MSTest.EndToEnd.csproj b/test/EndToEnd/FakeItEasy/Tethos.FakeItEasy.MSTest.EndToEnd/Tethos.FakeItEasy.MSTest.EndToEnd.csproj
index 4a820b6a..cc8542c8 100644
--- a/test/EndToEnd/FakeItEasy/Tethos.FakeItEasy.MSTest.EndToEnd/Tethos.FakeItEasy.MSTest.EndToEnd.csproj
+++ b/test/EndToEnd/FakeItEasy/Tethos.FakeItEasy.MSTest.EndToEnd/Tethos.FakeItEasy.MSTest.EndToEnd.csproj
@@ -18,8 +18,8 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
 		<PackageReference Include="coverlet.collector" Version="6.0.2" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/test/EndToEnd/Moq/Tethos.Moq.MSTest.EndToEnd/Tethos.Moq.MSTest.EndToEnd.csproj b/test/EndToEnd/Moq/Tethos.Moq.MSTest.EndToEnd/Tethos.Moq.MSTest.EndToEnd.csproj
index 5aa18d08..331acb34 100644
--- a/test/EndToEnd/Moq/Tethos.Moq.MSTest.EndToEnd/Tethos.Moq.MSTest.EndToEnd.csproj
+++ b/test/EndToEnd/Moq/Tethos.Moq.MSTest.EndToEnd/Tethos.Moq.MSTest.EndToEnd.csproj
@@ -14,8 +14,8 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
 		<PackageReference Include="coverlet.collector" Version="6.0.2" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/test/EndToEnd/NSubstitute/Tethos.NSubstitute.MSTest.EndToEnd/Tethos.NSubstitute.MSTest.EndToEnd.csproj b/test/EndToEnd/NSubstitute/Tethos.NSubstitute.MSTest.EndToEnd/Tethos.NSubstitute.MSTest.EndToEnd.csproj
index 3aef32dd..dc870b07 100644
--- a/test/EndToEnd/NSubstitute/Tethos.NSubstitute.MSTest.EndToEnd/Tethos.NSubstitute.MSTest.EndToEnd.csproj
+++ b/test/EndToEnd/NSubstitute/Tethos.NSubstitute.MSTest.EndToEnd/Tethos.NSubstitute.MSTest.EndToEnd.csproj
@@ -14,8 +14,8 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
 		<PackageReference Include="coverlet.collector" Version="6.0.2" />
 		<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
 			<PrivateAssets>all</PrivateAssets>