diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 24ac19178e..a34cea6cc5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -103,53 +103,38 @@ jobs:
 
             # Build the extension and tests (without redundant checks)
             - name: Build Tests and Extension
+              id: build_step
               run: npm run ci:build
 
             - name: Unit Tests with coverage - Linux
               id: unit_tests_linux
-              continue-on-error: true
-              if: runner.os == 'Linux'
+              if: ${{ !cancelled() && steps.build_step.outcome == 'success' && runner.os == 'Linux' }}
               run: |
                   npx nyc --nycrc-path .nycrc.unit.json --reporter=lcov npm run test:unit
 
             - name: Unit Tests - Non-Linux
               id: unit_tests_non_linux
-              continue-on-error: true
-              if: runner.os != 'Linux'
+              if: ${{ !cancelled() && steps.build_step.outcome == 'success' && runner.os != 'Linux' }}
               run: |
                   npm run test:unit
 
             - name: Extension Integration Tests - Linux
               id: integration_tests_linux
-              continue-on-error: true
-              if: runner.os == 'Linux'
+              if: ${{ !cancelled() && steps.build_step.outcome == 'success' && runner.os == 'Linux' }}
               run: xvfb-run -a npm run test:coverage
 
             - name: Extension Integration Tests - Non-Linux
               id: integration_tests_non_linux
-              continue-on-error: true
-              if: runner.os != 'Linux'
+              if: ${{ !cancelled() && steps.build_step.outcome == 'success' && runner.os != 'Linux' }}
               run: npm run test:integration
 
             - name: Webview Tests with Coverage
               id: webview_tests
-              continue-on-error: true
+              if: ${{ !cancelled() && steps.build_step.outcome == 'success' }}
               run: |
                   cd webview-ui
                   npm run test:coverage
 
-            - name: Check Test Results
-              if: always()
-              run: |
-                  failed=""
-                  [[ "${{ steps.unit_tests_linux.outcome }}" == "failure" && "${{ runner.os }}" == "Linux" ]] && failed="$failed unit_tests_linux"
-                  [[ "${{ steps.unit_tests_non_linux.outcome }}" == "failure" && "${{ runner.os }}" != "Linux" ]] && failed="$failed unit_tests_non_linux"
-                  [[ "${{ steps.integration_tests_linux.outcome }}" == "failure" && "${{ runner.os }}" == "Linux" ]] && failed="$failed integration_tests_linux"
-                  [[ "${{ steps.integration_tests_non_linux.outcome }}" == "failure" && "${{ runner.os }}" != "Linux" ]] && failed="$failed integration_tests_non_linux"
-                  [[ "${{ steps.webview_tests.outcome }}" == "failure" ]] && failed="$failed webview_tests"
-                  [[ -n "$failed" ]] && { echo "❌ The following test suites failed:$failed"; exit 1; }
-                  echo "✅ All tests passed"
-
             - name: Save Coverage Reports
               uses: actions/upload-artifact@v4
               # Only upload artifacts on Linux - We only need coverage from one OS
diff --git a/src/hosts/vscode/hostbridge/window/getOpenTabs.test.ts b/src/hosts/vscode/hostbridge/window/getOpenTabs.test.ts
index a3b36e1111..53a0079c04 100644
--- a/src/hosts/vscode/hostbridge/window/getOpenTabs.test.ts
+++ b/src/hosts/vscode/hostbridge/window/getOpenTabs.test.ts
@@ -62,10 +62,13 @@ describe("Hostbridge - Window - getOpenTabs", () => {
 			async () => {
 				const request = GetOpenTabsRequest.create({})
 				const response = await getOpenTabs(request)
+				console.log(
+					`[DEBUG] Waiting for 2 tabs, currently found ${response.paths.length}: ${JSON.stringify(response.paths)}`,
+				)
 				return response.paths.length === 2
 			},
 			{
-				timeout: 4000,
+				timeout: 8000,
 				interval: 50,
 			},
 		)
@@ -92,10 +95,13 @@ describe("Hostbridge - Window - getOpenTabs", () => {
 			async () => {
 				const request = GetOpenTabsRequest.create({})
 				const response = await getOpenTabs(request)
+				console.log(
+					`[DEBUG] Waiting for 3 tabs, currently found ${response.paths.length}: ${JSON.stringify(response.paths)}`,
+				)
 				return response.paths.length === 3
 			},
 			{
-				timeout: 4000,
+				timeout: 8000,
 				interval: 50,
 			},
 		)
@@ -129,10 +135,13 @@ describe("Hostbridge - Window - getOpenTabs", () => {
 			async () => {
 				const request = GetOpenTabsRequest.create({})
 				const response = await getOpenTabs(request)
+				console.log(
+					`[DEBUG] Waiting for 2 tabs (temp file + untitled), currently found ${response.paths.length}: ${JSON.stringify(response.paths)}`,
+				)
 				return response.paths.length === 2
 			},
 			{
-				timeout: 4000,
+				timeout: 8000,
 				interval: 50,
 			},
 		)
@@ -150,8 +159,11 @@ describe("Hostbridge - Window - getOpenTabs", () => {
 			2,
 			`Host bridge should return all tabs including deleted files. Found tabs: ${JSON.stringify(response.paths)}`,
 		)
-
-		// Clean up temp directory
-		await fs.rmdir(tempDir, { recursive: true })
+		try {
+			// Clean up temp directory
+			await fs.rmdir(tempDir, { recursive: true })
+		} catch (error) {
+			console.error(error)
+		}
 	})
 })
diff --git a/src/test/e2e/utils/helpers.ts b/src/test/e2e/utils/helpers.ts
index e855a89158..2e25754a2b 100644
--- a/src/test/e2e/utils/helpers.ts
+++ b/src/test/e2e/utils/helpers.ts
@@ -57,7 +57,7 @@ export class E2ETestHelper {
 		return `${baseName}${projectSuffix}`
 	}
 
-	public static async waitUntil(predicate: () => boolean | Promise<boolean>, maxDelay = 5000): Promise<void> {
+	public static async waitUntil(predicate: () => boolean | Promise<boolean>, maxDelay = 10000): Promise<void> {
 		let delay = 10
 		const start = Date.now()