diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..279a658
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,39 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [ main ]
+  push:
+    branches: [ main ]
+
+jobs:
+  shellcheck:
+    name: Shell Linting
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run ShellCheck
+        uses: ludeeus/action-shellcheck@master
+        with:
+          scandir: "."
+          format: gcc
+          severity: error
+
+  test:
+    name: Basic Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Test help output
+        run: |
+          ./claude.sh --help
+          ./claude-yolo --help
+
+      - name: Test version output
+        run: |
+          ./claude.sh --version
+          ./claude-yolo --version
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f077978..cc0d0e4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,24 +16,9 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  shellcheck:
-    name: Shell Linting
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
-        with:
-          scandir: "."
-          format: gcc
-          severity: warning
-
   build-and-push:
     name: Build and Push Docker Image
     runs-on: ubuntu-latest
-    needs: shellcheck
     permissions:
       contents: read
       packages: write