diff --git a/dotnet/test/common/WebDriver.Common.Tests.csproj b/dotnet/test/common/WebDriver.Common.Tests.csproj
index 4f8946ba069be..1a8c95ee51d79 100644
--- a/dotnet/test/common/WebDriver.Common.Tests.csproj
+++ b/dotnet/test/common/WebDriver.Common.Tests.csproj
@@ -6,16 +6,6 @@
     <RootNamespace>OpenQA.Selenium</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="obj\**" />
-    <EmbeddedResource Remove="obj\**" />
-    <None Remove="obj\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Remove="Settings.StyleCop" />
   </ItemGroup>
@@ -37,22 +27,14 @@
     <ProjectReference Include="..\..\src\webdriver\WebDriver.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="appconfig.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent" Condition="'$(OS)' == 'Windows_NT'">
-    <Exec Command="call &quot;$(ProjectDir)WebDriver.Common.Tests.csproj.prebuild.cmd&quot; &quot;$(ProjectDir)&quot;" />
-  </Target>
-
-  <Target Name="PreBuildNonWindows" BeforeTargets="PreBuildEvent" Condition="'$(OS)' != 'Windows_NT'">
-    <Exec Command="$(ProjectDir)WebDriver.Common.Tests.csproj.prebuild.sh $(ProjectDir)" />
+  <Target Name="BuildTestWebServer" AfterTargets="AfterBuild">
+    <Exec Command="bazel build //java/test/org/openqa/selenium/environment:appserver_deploy.jar" />
   </Target>
 
   <!-- It is automatically imported when Selenium.WebDriver consumed via nuget package -->
diff --git a/dotnet/test/common/WebDriver.Common.Tests.csproj.prebuild.cmd b/dotnet/test/common/WebDriver.Common.Tests.csproj.prebuild.cmd
deleted file mode 100644
index 7d569e3fbec72..0000000000000
--- a/dotnet/test/common/WebDriver.Common.Tests.csproj.prebuild.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-echo Building test web server
-bazel build //java/test/org/openqa/selenium/environment:appserver_deploy.jar
diff --git a/dotnet/test/common/WebDriver.Common.Tests.csproj.prebuild.sh b/dotnet/test/common/WebDriver.Common.Tests.csproj.prebuild.sh
deleted file mode 100755
index d692e821c93a3..0000000000000
--- a/dotnet/test/common/WebDriver.Common.Tests.csproj.prebuild.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-echo "Building test web server"
-bazel build //java/test/org/openqa/selenium/environment:appserver_deploy.jar