diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e322c9ce31..48008b8adf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macOS-latest, ubuntu-latest]
+        yarn: [classic, berry]
     steps:
       - name: Fix git checkout line endings
         run: git config --global core.autocrlf input
@@ -29,7 +30,11 @@ jobs:
         run: |
           npm install -g npm@8
       - name: Install
+        if: matrix.yarn == 'classic'
         run: yarn install
+      - name: Install with berry
+        if: matrix.yarn == 'berry'
+        run: yarn set version berry && yarn install
       - name: Lint
         run: yarn lint
       - name: Ensure packages in sync
@@ -44,6 +49,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macOS-latest, ubuntu-20.04]
+        yaen: [classic, berry]
     steps:
       - name: Fix git checkout line endings
         run: git config --global core.autocrlf input
@@ -71,7 +77,11 @@ jobs:
           node-version: 14.x
           cache: yarn
       - name: Install
+        if: matrix.yarn == 'classic'
         run: yarn install --frozen-lockfile
+      - name: Install with berry
+        if: matrix.yarn == 'berry'
+        run: yarn set version berry && yarn install
       - name: Build
         run: yarn build
       - name: Test