diff --git a/circle.yml b/circle.yml
index 400dadf21..11076d884 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,13 +13,6 @@ machine:
   post:
     - echo "there"
 
-# https://circleci.com/docs/manually#databases
-
-database:
-  override:
-    - psql -c 'create database template_postgis;'
-    - psql -c 'create extension postgis;' -d template_postgis
-
 checkout:
   post:
     - git submodule update --init
@@ -38,7 +31,13 @@ dependencies:
     - which clang-${LLVM_VERSION}
     - which clang++-${LLVM_VERSION}
 
+database:
+  pre:
+    - ./scripts/circleci.sh
+  override:
+    - psql -c 'create database template_postgis;'
+    - psql -c 'create extension postgis;' -d template_postgis
 
 test:
   override:
-    - ./scripts/circleci.sh
+    - make test
diff --git a/scripts/circleci.sh b/scripts/circleci.sh
index 5bc43f476..5dffa339c 100755
--- a/scripts/circleci.sh
+++ b/scripts/circleci.sh
@@ -9,5 +9,4 @@ ${CCACHE} --version
 ${CCACHE} -p || true
 ${CCACHE} --show-stats || true
 ./configure CC="clang-${LLVM_VERSION}" CXX="${CCACHE} clang++-${LLVM_VERSION} -Qunused-arguments"
-make
-make test
\ No newline at end of file
+make
\ No newline at end of file