diff --git a/circle.yml b/circle.yml
index 16926a0c4c..565833328e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -27,24 +27,10 @@ test:
     # Start the server before all tests:
     - node -e 'require("babel-polyfill"); require("./build/server/server");':
         background: true
-    # addon tests
-    - FIREFOX_CHANNEL=NIGHTLY npm test || true
     # server tests
     - ./bin/test-request put '{}'
     - ./bin/load_test_exercise.py http://localhost:10080
     - npm run test:server
-    # run zap baseline against the server
-    # Only fail on error code 1, which indicates at least one FAIL was found.
-    # error codes 2 & 3 indicate WARN or other, and should not break the run
-    - docker pull owasp/zap2docker-weekly
-    - >
-        (
-        ip="$(ip -f inet -o addr show docker0 | awk '{print $4}' | cut -d '/' -f 1)" &&
-        docker run -t owasp/zap2docker-weekly zap-baseline.py \
-            -t http://${ip}:10080 \
-            -u https://github.com/raw/mozilla-services/screenshots/master/.zap-baseline.conf;
-        if [ $? -ne 1 ]; then exit 0; else exit 1; fi;
-        )
 
   post:
     - bash <(curl -s https://codecov.io/bash)