diff --git a/.github/workflows/E2ETest.yml b/.github/workflows/E2ETest.yml
index cb2abe72b..ff5b2bb67 100644
--- a/.github/workflows/E2ETest.yml
+++ b/.github/workflows/E2ETest.yml
@@ -18,24 +18,35 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.x
+
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 8.0.x
+
       - name: Setup E2E tests
         shell: pwsh
         run: |
-          .\test\e2e\Tests\build-e2e-test.ps1
+          .\test\e2e\Tests\build-e2e-test.ps1 -SkipStorageEmulator
+
       - name: Build
         working-directory: test/e2e/Tests
         run: dotnet build
-      - name: Test with the dotnet CLI
-        working-directory: test/e2e/Tests
-        run: dotnet test
+
+      # Install Azurite
+      - name: Set up Node.js (needed for Azurite)
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18.x' # Azurite requires at least Node 18
+
+      - name: Install Azurite
+        run: npm install -g azurite
+
       - name: Run E2E tests
         working-directory: test/e2e/Tests
         run: dotnet test
diff --git a/test/e2e/Tests/build-e2e-test.ps1 b/test/e2e/Tests/build-e2e-test.ps1
index 6fe8d0f4b..9c32117aa 100644
--- a/test/e2e/Tests/build-e2e-test.ps1
+++ b/test/e2e/Tests/build-e2e-test.ps1
@@ -13,7 +13,7 @@ param(
     $SkipStorageEmulator,
 
     [Switch]
-    $SkipCosmosDBEmulator,
+    $StartCosmosDBEmulator,
 
     [Switch]
     $SkipCoreTools,
@@ -145,7 +145,7 @@ dotnet build app.csproj
 
 Set-Location $PSScriptRoot
 
-if ($SkipStorageEmulator -And $SkipCosmosDBEmulator)
+if ($SkipStorageEmulator -And -not $StartCosmosDBEmulator)
 {
   Write-Host
   Write-Host "---Skipping emulator startup---"
@@ -153,7 +153,9 @@ if ($SkipStorageEmulator -And $SkipCosmosDBEmulator)
 }
 else 
 {
-  .\start-emulators.ps1 -SkipStorageEmulator:$SkipStorageEmulator -StartCosmosDBEmulator:$false -EmulatorStartDir $ProjectTemporaryPath
+  .\start-emulators.ps1 -SkipStorageEmulator:$SkipStorageEmulator -StartCosmosDBEmulator:$StartCosmosDBEmulator -EmulatorStartDir $ProjectTemporaryPath
 }
 
+Set-Location $PSScriptRoot
+
 StopOnFailedExecution
\ No newline at end of file