diff --git a/circle.yml b/circle.yml
index aa92ca5c83b..36f01b5be77 100644
--- a/circle.yml
+++ b/circle.yml
@@ -18,9 +18,11 @@ dependencies:
     - docker pull cassandra:3
     - docker pull postgres:9.5
     - docker pull redis:3.2
-test:
+database:
   override:
     - sudo service postgresql stop
+    # Wait for Postgres to stop, sometimes this takes a bit of time
+    - while nc -v -z localhost 5432 ; do sleep 0.2 ; done
     - sudo service redis-server stop
     - docker run -d -p 9200:9200 elasticsearch:2.3
     - docker run -d -p 9042:9042 cassandra:3
@@ -30,6 +32,8 @@ test:
     - until nc -v -z localhost 9042 ; do sleep 0.2 ; done
     # Wait for Postgres to be ready
     - until PGPASSWORD=test PGUSER=test PGDATABASE=test psql -h localhost -p 5432 -c "select 1" ; do sleep 0.2 ; done
+test:
+  override:
     - python2.7 setup.py test
     - python3.4 setup.py test
 deployment: