diff --git a/.github/workflows/grammars.yml b/.github/workflows/grammars.yml
index eaf1782..e98db51 100644
--- a/.github/workflows/grammars.yml
+++ b/.github/workflows/grammars.yml
@@ -22,6 +22,7 @@ env:
 jobs:
   tree-sitter-grammars:
     name: Building tree-sitter (${{ matrix.os }})
+    if: ${{ false }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2b96dc1..6aab3e8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,10 +3,10 @@ name: E2E and Unit tests
 on:
   pull_request:
     branches:
-      - master
+      - main
   push:
     branches:
-      - master
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -44,16 +44,28 @@ jobs:
           node-version: 22.x
           cache: "yarn"
 
+      - name: Setup EMSDK
+        uses: pyodide/setup-emsdk@v15
+        env:
+          EMSDK_VERSION: 4.0.15
+        with:
+          version: ${{ env.EMSDK_VERSION }}
+          actions-cache-folder: "emsdk-cache"
+          cache-key: emsdk-cache-${{ runner.os }}-${{ runner.arch }}-${{ env.EMSDK_VERSION }}
+
       - name: Install dependencies
         env:
           YARN_ENABLE_HARDENED_MODE: false
         run: yarn install --immutable
 
+      - name: Build WASM
+        run: yarn run grammar:wasm
+
       - name: Build Extension
-        run: yarn build
+        run: yarn run build
 
       - name: Run unit tests
-        run: yarn test
+        run: yarn run test
 
       - name: Run e2e tests
         if: matrix.os == 'ubuntu-latest'