diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9e7069e..db62f4cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,5 @@ jobs:
         node-version: ${{ matrix.node }}
     - name: Install dependencies
       run: npm install
-    - name: Build commonjs
-      run: npm run build
     - name: Run tests
-      run: npm run unit
+      run: npm run test
diff --git a/README.md b/README.md
index 87ace4c1..58b863ce 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ We work hard to ensure that Espree is safe for everyone and that security issues
 
 ## Build Commands
 
-* `npm test` - run all linting and tests
+* `npm test` - run all tests
 * `npm run lint` - run all linting
 
 ## Differences from Espree 2.x
diff --git a/package.json b/package.json
index 12c8d0b1..60b71853 100644
--- a/package.json
+++ b/package.json
@@ -67,22 +67,21 @@
     "pre-commit": "lint-staged"
   },
   "scripts": {
-    "unit": "npm-run-all -s unit:*",
-    "unit:esm": "c8 mocha --color --reporter progress --timeout 30000 'tests/lib/**/*.js'",
-    "unit:cjs": "mocha --color --reporter progress --timeout 30000 tests/lib/commonjs.cjs",
-    "test": "npm-run-all -p unit lint",
-    "lint": "eslint .  --report-unused-disable-directives",
-    "fixlint": "npm run lint -- --fix",
     "build": "rollup -c rollup.config.js",
     "build:debug": "npm run build -- -m",
-    "update-version": "node tools/update-version.js",
+    "build:docs": "node tools/sync-docs.js",
+    "build:update-version": "node tools/update-version.js",
+    "lint": "eslint .  --report-unused-disable-directives",
+    "lint:fix": "npm run lint -- --fix",
+    "prepublishOnly": "npm run build:update-version && npm run build",
     "pretest": "npm run build",
-    "prepublishOnly": "npm run update-version && npm run build",
-    "sync-docs": "node sync-docs.js",
-    "generate-release": "eslint-generate-release",
-    "generate-alpharelease": "eslint-generate-prerelease alpha",
-    "generate-betarelease": "eslint-generate-prerelease beta",
-    "generate-rcrelease": "eslint-generate-prerelease rc",
-    "publish-release": "eslint-publish-release"
+    "release:generate:latest": "eslint-generate-release",
+    "release:generate:alpha": "eslint-generate-prerelease alpha",
+    "release:generate:beta": "eslint-generate-prerelease beta",
+    "release:generate:rc": "eslint-generate-prerelease rc",
+    "release:publish": "eslint-publish-release",
+    "test": "npm-run-all -s test:*",
+    "test:esm": "c8 mocha --color --reporter progress --timeout 30000 'tests/lib/**/*.js'",
+    "test:cjs": "mocha --color --reporter progress --timeout 30000 tests/lib/commonjs.cjs"
   }
 }