diff --git a/.drone.yml b/.drone.yml
index 2e25efb..5722c4b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,7 @@ workspace:
   path: src
 
 pipeline:
-  test:
+  test_pr:
     image: golang:alpine
     environment:
       - CGO_ENABLED=0
@@ -11,12 +11,14 @@ pipeline:
     commands:
       - go test -cover db.go
       - go test -cover srv.go
+    when:
+      event: [ push, pull_request ]
 
-  build:
+  build_pr:
     image: golang:alpine
     commands: sh .drone.sh
     when:
-      event: [ push, tag ]
+      event: [ push, pull_request ]
 
   publish_srv:
     image: plugins/docker
@@ -40,6 +42,12 @@ pipeline:
       branch: master
       event: push
 
+  build:
+    image: golang:alpine
+    commands: sh .drone.sh
+    when:
+      event: tag
+
   release_srv:
     image: plugins/docker
     repo: kube-registry.kube-system.svc.cluster.local:5000/ciapp/srv