diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 7ae2ea4..ab5837b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,13 +1,24 @@
 name: Package Extension
 on: push
 jobs:
-  package-extension:
+  test-and-package:
+    name: "Test & Package"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
 
       - run: bun install
+
+      - name: Lint & Check Formatting
+        run: |
+          failure=0
+          bun prettier . --check || failure=1
+          bun eslint || failure=1
+
+      - name: Test
+        run: bun test
+
       - run: bun run package
 
       - name: Setup Environment
diff --git a/package.json b/package.json
index 26a84b2..a1934e9 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,8 @@
     "publish": "bun run package && bun run vsce-publish",
     "clean": "rm -r ./dist",
     "web": "bun run --cwd ./src/frontend/ vite",
-    "test": "bun run vitest"
+    "format": "bun prettier . --write",
+    "lint": "bun format && bun run eslint"
   },
   "//": "START EXTENSION ATTRIBUTES",
   "publisher": "tamir-bahar",