diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b4cfc9f10..497203afe 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -54,6 +54,10 @@ jobs:
         run: yarn lint
         if: success()
 
+      - name: Run code-server unit tests
+        run: yarn test:unit
+        if: success()
+
       - name: Upload coverage report to Codecov
         run: yarn coverage
         if: success()
@@ -404,9 +408,6 @@ jobs:
           rm -r node_modules/playwright
           yarn install --check-files
 
-      - name: Run end-to-end tests
-        run: yarn test:unit
-
       - name: Run end-to-end tests
         run: yarn test:e2e
 
diff --git a/src/node/routes/index.ts b/src/node/routes/index.ts
index 08a2dcc18..13232f703 100644
--- a/src/node/routes/index.ts
+++ b/src/node/routes/index.ts
@@ -162,7 +162,7 @@ export const register = async (
   }
 
   server.on("close", () => {
-    vscode.vscodeServer.close()
+    vscode?.vscodeServer.close()
   })
 
   app.use(() => {
diff --git a/test/unit/node/routes/static.test.ts b/test/unit/node/routes/static.test.ts
index 3856e0f65..49d4716a7 100644
--- a/test/unit/node/routes/static.test.ts
+++ b/test/unit/node/routes/static.test.ts
@@ -7,7 +7,7 @@ import * as integration from "../../../utils/integration"
 
 const NOT_FOUND = {
   code: 404,
-  message: "not found",
+  message: "Not Found",
 }
 
 describe("/_static", () => {