diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dcbb6b73d2..76b0cbc76f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -109,12 +109,6 @@ jobs:
       - name: Setup environment
         run: sudo apt-get install libelf1
 
-      - name: Set yarn version
-        run: |
-          yarn -v
-          yarn set version 4.1.1
-          yarn -v
-
       - name: Install dependencies
         run: yarn install --immutable
 
diff --git a/frontends/package.json b/frontends/package.json
index ffe3875ab1..882731e9e3 100644
--- a/frontends/package.json
+++ b/frontends/package.json
@@ -23,16 +23,14 @@
     "lint-fix": "yarn lint-check --fix",
     "fmt-check": "prettier --check .",
     "fmt-fix": "prettier --write .",
-    "test": "yarn global:test",
-    "test-watch": "yarn global:test-watch",
+    "test": "NODE_ENV=test jest",
+    "test-watch": "NODE_ENV=test jest --watch",
     "style-lint": "yarn in-workspaces run global:style-lint",
     "style-lint-fix": "yarn in-workspaces run global:style-lint-fix",
     "typecheck": "yarn in-workspaces run global:typecheck",
     "global:style-lint": "cd $INIT_CWD && stylelint '**/*.{css,scss,ts,tsx}' --allow-empty-input",
     "global:style-lint-fix": "cd $INIT_CWD && stylelint '**/*.{css,scss,ts,tsx}' --allow-empty-input --fix",
-    "global:test": "cd $INIT_CWD && NODE_ENV=test jest",
     "global:typecheck": "cd $INIT_CWD && tsc --noEmit",
-    "global:test-watch": "cd $INIT_CWD && NODE_ENV=test jest --watch",
     "create-package": "yarn workspace ol-template plop package",
     "build-github-pages": "yarn workspace github-pages build",
     "storybook": "yarn workspace mit-open storybook",
diff --git a/package.json b/package.json
index 2240a4bc48..142ae70bc1 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "yarn workspace mit-open run build",
     "style-lint": "yarn workspace frontends run style-lint",
-    "test": "yarn workspace frontends global:test",
+    "test": "yarn workspace frontends run test",
     "lint-check": "yarn workspace frontends run lint-check",
     "typecheck": "yarn workspace frontends run typecheck"
   },