diff --git a/.drone.yml b/.drone.yml
index 5330d04..96ecde7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,11 +3,41 @@ workspace:
   path: src/cwtch.im/cwtch
 
 pipeline:
-  build:
+  fetch:
     image: golang
     commands:
+      - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/bin/tor
+      - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/torrc
+      - chmod a+x tor
       - go list ./... | xargs go get
       - go get -u github.com/golang/lint/golint
+  quality:
+    image: golang
+    commands:
       - go list ./... | xargs go vet
       - go list ./... | xargs golint -set_exit_status
-      - sh testing/tests.sh
\ No newline at end of file
+  units-tests:
+    image: golang
+    commands:
+      - export PATH=$PATH:/go/src/cwtch.im/cwtch
+      - sh testing/tests.sh
+  integ-test:
+    image: golang
+    commands:
+      - ./tor -f ./torrc
+      - sleep 10
+      - go test -v cwtch.im/cwtch/testing
+  notify-email:
+      image: drillster/drone-email
+      host: build.openprivacy.ca
+      port: 25
+      skip_verify: true
+      from: dan@openprivacy.ca
+      when:
+        status: [ success, changed, failure ]
+  notify-gogs:
+    image: golang
+    secrets: [buildbot]
+    commands:
+      - echo "Notifying"
+      - curl -H "Authorization:token $BUILDBOT" https://git.openprivacy.ca/api/v1/repos/cwtch.im/cwtch
\ No newline at end of file