diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8d615d4b..f1300938 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -116,6 +116,7 @@
 		<PackageReference Include="FluentAssertions" Version="6.*" PrivateAssets="All" />
 		<PackageReference Include="FluentAssertions.Analyzers" Version="0.*" PrivateAssets="All" />
 		<PackageReference Include="MSTest" Version="3.*" />
+		
 		<!-- @robertmclaws: Temporary workaround for 8.0 bug: https://github.com/microsoft/vstest/pull/4792 -->
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*-*" />
 		<PackageReference Include="Microsoft.TestPlatform" Version="17.*-*" />
diff --git a/src/Simple.OData.Tests.Shared.NorthwindService/Simple.OData.Tests.Shared.NorthwindService.csproj b/src/Simple.OData.Tests.Shared.NorthwindService/Simple.OData.Tests.Shared.NorthwindService.csproj
index 16dbfc82..7017a017 100644
--- a/src/Simple.OData.Tests.Shared.NorthwindService/Simple.OData.Tests.Shared.NorthwindService.csproj
+++ b/src/Simple.OData.Tests.Shared.NorthwindService/Simple.OData.Tests.Shared.NorthwindService.csproj
@@ -4,5 +4,11 @@
 		<TargetFrameworks>net8.0</TargetFrameworks>
 		<DocumentationFile>$(DocumentationFile)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
+
+	<!-- @robertmclaws: This is temporary and should be removed when Microsoft.NET.Test.Sdk 17.10 RTMs. -->
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*-*" />
+		<PackageReference Include="Microsoft.TestPlatform" Version="17.*-*" />
+	</ItemGroup>
 	
 </Project>
\ No newline at end of file