diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
index e0fd0537..57e4956a 100644
--- a/azure-pipelines/build.yml
+++ b/azure-pipelines/build.yml
@@ -4,8 +4,6 @@ parameters:
 jobs:
 - job: Windows
   pool: ${{ parameters.windowsPool }}
-  variables:
-    BuildPlatform: Any CPU
   steps:
   - checkout: self
     clean: true
@@ -14,9 +12,6 @@ jobs:
   - powershell: '& (./azure-pipelines/Get-nbgv.ps1) cloud'
     displayName: Set build number
 
-  - pwsh: ./tools/Emulators.ps1
-    displayName: Start storage emulators
-
   - template: dotnet.yml
 
 - job: Linux
diff --git a/azure-pipelines/dotnet.yml b/azure-pipelines/dotnet.yml
index 612af21a..47be703e 100644
--- a/azure-pipelines/dotnet.yml
+++ b/azure-pipelines/dotnet.yml
@@ -1,11 +1,14 @@
 steps:
 
-- script: dotnet build --no-restore -c $(BuildConfiguration) -p:Platform="$(BuildPlatform)" /v:m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
+- script: dotnet build --no-restore -c $(BuildConfiguration) /v:m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
   displayName: dotnet build
 
-- script: dotnet pack --no-build -c $(BuildConfiguration) -p:Platform="$(BuildPlatform)" /v:m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/pack.binlog"
+- script: dotnet pack --no-build -c $(BuildConfiguration) /v:m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/pack.binlog"
   displayName: dotnet pack
 
+- pwsh: ./tools/Emulators.ps1
+  displayName: Start storage emulators
+
 - task: DotNetCoreCLI@2
   displayName: dotnet test -f net472
   inputs:
@@ -19,7 +22,7 @@ steps:
   displayName: dotnet test -f netcoreapp2.1
   inputs:
     command: test
-    arguments: --no-build -c $(BuildConfiguration) -p:Platform="$(BuildPlatform)" -f netcoreapp2.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings"
+    arguments: --no-build -c $(BuildConfiguration) -f netcoreapp2.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings"
     workingDirectory: test/IronPigeon.Tests
     testRunTitle: netcoreapp2.1-$(Agent.JobName)
   env:
@@ -29,7 +32,7 @@ steps:
   displayName: dotnet test -f netcoreapp3.1
   inputs:
     command: test
-    arguments: --no-build -c $(BuildConfiguration) -p:Platform="$(BuildPlatform)" -f netcoreapp3.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings"
+    arguments: --no-build -c $(BuildConfiguration) -f netcoreapp3.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings"
     testRunTitle: netcoreapp3.1-$(Agent.JobName)
   env:
     CosmosDBConnectionString: $(CosmosDBConnectionString_NonWindows)