diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f9c996b..dd0c4ad 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,6 +7,18 @@ on:
       - main
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-go@v5
+      with:
+        go-version: '1.22.3'
+    - run: yarn install --frozen-lockfile
+    - run: yarn lint
+    - run: yarn cucumber
+      env:
+        DOCKER_HOST: unix:///var/run/docker.sock
   build:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -30,9 +42,11 @@ jobs:
         cache-to: type=gha,mode=max
   deploy:
     runs-on: ubuntu-latest
-    needs: build
+    needs:
+    - build
+    - test
     timeout-minutes: 30
-    if: github.ref == 'refs/heads/main'
+    # if: github.ref == 'refs/heads/main'
     steps:
     - uses: actions/checkout@v4
     - name: GCP auth
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
deleted file mode 100644
index 6b34dee..0000000
--- a/.github/workflows/ci.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: CI
-on: push
-env:
-  DOCKER_HOST: unix:///var/run/docker.sock
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with:
-        go-version: '1.22.3'
-    - run: go version
-    - run: yarn
-    - run: yarn lint
-    - run: yarn cucumber