diff --git a/circle.yml b/circle.yml
index fee4fc68a..affa9b308 100644
--- a/circle.yml
+++ b/circle.yml
@@ -16,10 +16,12 @@ dependencies:
     - sudo sed -e 's:/home/ubuntu:/root:g' ~root/.ssh/config
     ####
     - sudo -E make -e setup-deploy-tests
-test:
-  override:
+  post:
     - sudo -E make -e lint
+test:
+  pre:
     - sudo -E make -e unit-tests
+  override:
     ### deploy tests (against buildstep release) ####
     - sudo -E make -e deploy-tests: { timeout: 1800 }
     ### deploy tests (against buildstep master) ####