diff --git a/cgroup-limit/cgroup-limit.csproj b/cgroup-limit/cgroup-limit.csproj
index cf1ebde..841aa84 100644
--- a/cgroup-limit/cgroup-limit.csproj
+++ b/cgroup-limit/cgroup-limit.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(TestTargetFramework)</TargetFramework>
diff --git a/createdump-aspnet/test.sh b/createdump-aspnet/test.sh
index 8d6e1b5..1a12f7a 100755
--- a/createdump-aspnet/test.sh
+++ b/createdump-aspnet/test.sh
@@ -9,12 +9,12 @@ IFS='.-' read -ra VERSION_SPLIT <<< "$1"
 
 version=${VERSION_SPLIT[0]}.${VERSION_SPLIT[1]}
 
-dotnet new web --force
+dotnet new web --no-restore --force
 
 sed -i -e 's|.UseStartup|.UseUrls("http://localhost:5000").UseStartup|' Program.cs
 
 # Do not kick off compiler servers that hang around after a build
-dotnet build -p:UseRazorBuildServer=false -p:UseSharedCompilation=false /m:1
+dotnet build -p:UseRazorBuildServer=false -p:UseSharedCompilation=false /p:UsingMicrosoftNETSdkRazor=false /p:ScopedCssEnabled=false /m:1
 
 dotnet run --no-build --no-restore &
 sleep 5
diff --git a/debugging-sos-lldb-via-core/test.sh b/debugging-sos-lldb-via-core/test.sh
index 80a5e8f..a59faab 100755
--- a/debugging-sos-lldb-via-core/test.sh
+++ b/debugging-sos-lldb-via-core/test.sh
@@ -58,9 +58,9 @@ rm -rf TestDir
 mkdir TestDir
 cd TestDir
 
-dotnet new web
+dotnet new web --no-restore
 sed -i -e 's|.UseStartup|.UseUrls("http://localhost:5000").UseStartup|' Program.cs
-dotnet build "${no_server[@]}"
+dotnet build "${no_server[@]}" /p:UsingMicrosoftNETSdkRazor=false /p:ScopedCssEnabled=false
 
 dotnet bin/Debug/net*/TestDir.dll &
 run_pid=$!
diff --git a/debugging-via-dotnet-dump/test.sh b/debugging-via-dotnet-dump/test.sh
index 9c1534f..6590a6a 100755
--- a/debugging-via-dotnet-dump/test.sh
+++ b/debugging-via-dotnet-dump/test.sh
@@ -102,7 +102,7 @@ rm -rf TestDir
 mkdir TestDir
 cd TestDir
 
-dotnet new web
+dotnet new web --no-restore
 sed -i -e 's|.UseStartup|.UseUrls("http://localhost:5000").UseStartup|' Program.cs
 dotnet build "${no_server[@]}"
 
diff --git a/publish-aspnet-selfcontained/test.sh b/publish-aspnet-selfcontained/test.sh
index 162a60a..2df2ba9 100755
--- a/publish-aspnet-selfcontained/test.sh
+++ b/publish-aspnet-selfcontained/test.sh
@@ -21,8 +21,8 @@ url="http://localhost:5000"
 dir=web
 output_dir=output
 rm -rf "$dir" "$output_dir"
-dotnet new web -o "$dir"
-dotnet publish --sc -r "$runtime_id" -o "$output_dir" "$dir" 
+dotnet new web --no-restore -o "$dir"
+dotnet publish --sc -r "$runtime_id" -o "$output_dir" /p:UsingMicrosoftNETSdkRazor=false /p:ScopedCssEnabled=false "$dir"
 
 ASPNETCORE_URLS="$url" "./$output_dir/web" &
 run_pid=$!
diff --git a/telemetry-is-off-by-default/test-telemetry-tcpdump.sh b/telemetry-is-off-by-default/test-telemetry-tcpdump.sh
index d7d49a9..8cc838c 100755
--- a/telemetry-is-off-by-default/test-telemetry-tcpdump.sh
+++ b/telemetry-is-off-by-default/test-telemetry-tcpdump.sh
@@ -16,8 +16,8 @@ sleep 2
 rm -rf WebTest
 mkdir -p WebTest
 pushd WebTest
-dotnet new web >/dev/null 2>&1 || true
-dotnet publish
+dotnet new web --no-restore >/dev/null 2>&1 || true
+dotnet publish /p:UsingMicrosoftNETSdkRazor=false /p:ScopedCssEnabled=false
 popd
 sleep 2
 sudo --non-interactive pkill tcpdump
diff --git a/telemetry-is-off-by-default/test.sh b/telemetry-is-off-by-default/test.sh
index fdad464..01297a3 100755
--- a/telemetry-is-off-by-default/test.sh
+++ b/telemetry-is-off-by-default/test.sh
@@ -12,7 +12,7 @@ set -euo pipefail
 IFS=$'\n\t'
 set -x
 
-no_server=("/nodeReuse:false" "/p:UseSharedCompilation=false" "/p:UseRazorBuildServer=false")
+no_server=("/nodeReuse:false" "/p:UseSharedCompilation=false" "/p:UseRazorBuildServer=false" "/p:UsingMicrosoftNETSdkRazor=false" "/p:ScopedCssEnabled=false")
 
 IFS='.-' read -ra VERSION_SPLIT <<< "$1"
 DOTNET_MAJOR="${VERSION_SPLIT[0]}"