diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1f159a4..341935d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,12 @@ jobs:
             
   database:
    - image: circleci/postgres:9.6-alpine
-        environment:
+    steps:
+      - checkout
+      - restore_cache:
+          key: yarn-packages-v3{{ checksum "yarn.lock" }}
+      - run: yarn test:e2e
+      environment:
           POSTGRES_USER: psqluer
           POSTGRES_DB: psdb
           DATABASE_URL: postgres://psqluer:psqlpassword@localhost:5432/psdb
@@ -61,11 +66,6 @@ jobs:
           API_PORT: 3000
           API_HOST: localhost
           API_PROTOCOL: http
-    steps:
-      - checkout
-      - restore_cache:
-          key: yarn-packages-v3{{ checksum "yarn.lock" }}
-      - run: yarn test:e2e
       - save_cache:
           key: yarn-packages-v3{{ checksum "yarn.lock" }}      
           paths: