diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d902094..c42b81a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,11 @@ jobs:
       - run: npm ci
       - run: xvfb-run -a npm run test:coverage
         if: runner.os == 'Linux'
-      - run: npm test
+      # On non-Linux, compile and run tests directly to skip the redundant lint
+      # (lint is OS-agnostic and already runs on Linux via test:coverage)
+      - run: npm run compile
+        if: runner.os != 'Linux'
+      - run: npm run test:vscode
         if: runner.os != 'Linux'
       - name: Upload coverage to Codecov
         if: runner.os == 'Linux'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2c167d6..2f2d786 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   release-please:
+    timeout-minutes: 5
     permissions:
       contents: write # for googleapis/release-please-action to create release commit
       pull-requests: write # for googleapis/release-please-action to create release PR
@@ -26,6 +27,7 @@ jobs:
 
   release:
     needs: release-please
+    timeout-minutes: 20
     runs-on: ubuntu-latest
     environment: marketplace
     if: needs.release-please.outputs.release_created == 'true'
diff --git a/package.json b/package.json
index 9f5ab4d..4050659 100644
--- a/package.json
+++ b/package.json
@@ -97,6 +97,7 @@
     "pretest": "npm run compile && npm run lint",
     "lint": "eslint src",
     "test": "vscode-test",
+    "test:vscode": "vscode-test",
     "test:unit": "npm run compile && c8 --config .c8rc.json mocha out/unit/unit.test.js",
     "test:coverage": "npm run compile && npm run lint && c8 --config .c8rc.json mocha out/unit/unit.test.js && vscode-test",
     "deploy": "vsce publish"