diff --git a/.github/workflows/TestCosmos.yaml b/.github/workflows/TestCosmos.yaml
index 324e959157a..7c975c16e4b 100644
--- a/.github/workflows/TestCosmos.yaml
+++ b/.github/workflows/TestCosmos.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Start Cosmos Emulator
         run: |
           Import-Module "$env:ProgramFiles\Azure Cosmos DB Emulator\PSModules\Microsoft.Azure.CosmosDB.Emulator"
-          Start-CosmosDbEmulator
+          Start-CosmosDbEmulator -Timeout 360
 
       - name: Checkout
         uses: actions/checkout@v2
@@ -26,5 +26,10 @@ jobs:
         run: restore.cmd
         shell: cmd
 
+      - name: Build
+        run: build.cmd /p:Projects=${{ github.workspace }}\test\EFCore.Cosmos.FunctionalTests\EFCore.Cosmos.FunctionalTests.csproj
+        shell: cmd
+
       - name: Test on Cosmos
-        run: .dotnet\dotnet test test\EFCore.Cosmos.FunctionalTests
+        run: test.cmd /p:Projects=${{ github.workspace }}\test\EFCore.Cosmos.FunctionalTests\EFCore.Cosmos.FunctionalTests.csproj
+        shell: cmd
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index eb8243d74f8..5acdd6d8b81 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -132,7 +132,6 @@ stages:
               - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
                 env:
                   Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
-                  COMPlus_EnableWriteXorExecute: 0 # Work-around for https://github.com/dotnet/runtime/issues/70758
                 name: Build
               - task: PublishBuildArtifacts@1
                 displayName: Upload TestResults
@@ -239,7 +238,6 @@ stages:
                   HelixAccessToken: $(_HelixAccessToken)
                   SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
                   MSSQL_SA_PASSWORD: "Password12!"
-                  COMPlus_EnableWriteXorExecute: 0 # Work-around for https://github.com/dotnet/runtime/issues/70758
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml
diff --git a/eng/helix.proj b/eng/helix.proj
index 9bf9b4053aa..68d80d146d5 100644
--- a/eng/helix.proj
+++ b/eng/helix.proj
@@ -37,13 +37,6 @@
     </XUnitProject>
   </ItemGroup>
 
-  <!-- Work-around for https://github.com/dotnet/runtime/issues/70758 -->
-  <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))'">
-    <XUnitProject Update="$(RepoRoot)/test/EFCore.InMemory.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.Sqlite.FunctionalTests/*.csproj">
-      <PreCommands>$(PreCommands); export COMPlus_EnableWriteXorExecute=0</PreCommands>
-    </XUnitProject>
-  </ItemGroup>
-
   <!-- Start SqlServer instance for test projects which uses SqlServer on docker. Also remove other projects as they will be run outside of docker. -->
   <ItemGroup Condition = "'$(HelixTargetQueue.Contains(`ubuntu-18.04-helix-sqlserver-amd64`))'">
     <XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>
diff --git a/global.json b/global.json
index f5ee9a6ff28..8a5c0f0e283 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "tools": {
-    "dotnet": "7.0.100-preview.5.22307.18"
+    "dotnet": "7.0.100-preview.6.22352.1"
   },
   "sdk": {
-    "version": "7.0.100-preview.5.22307.18",
+    "version": "7.0.100-preview.6.22352.1",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
   },