diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73091d2e9..664608d09 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,8 +61,12 @@ jobs:
         run: npx nx affected:lint --parallel=3 --max-warnings=0
 
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
     name: Unit tests
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -78,11 +82,18 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Unit test affected projects
-        run: npx nx affected:test --parallel=3
+        uses: Wandalen/wretry.action@master
+        with:
+          command: npx nx affected:test --parallel=3
+          attempt_limit: 2
 
   e2e:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
     name: E2E tests
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -98,7 +109,10 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: E2E test affected projects
-        run: npx nx affected:e2e --parallel=3
+        uses: Wandalen/wretry.action@master
+        with:
+          command: npx nx affected:e2e --parallel=3
+          attempt_limit: 2
 
   build:
     runs-on: ubuntu-latest
diff --git a/e2e/cli-e2e/vite.config.ts b/e2e/cli-e2e/vite.config.ts
index 93cafe49f..ef03abdda 100644
--- a/e2e/cli-e2e/vite.config.ts
+++ b/e2e/cli-e2e/vite.config.ts
@@ -13,7 +13,7 @@ export default defineConfig({
   // },
 
   test: {
-    testTimeout: 7000,
+    testTimeout: 20000,
     globals: true,
     cache: {
       dir: '../../node_modules/.vitest',