diff --git a/.circleci/config.yml b/.circleci/config.yml
index 78c2fa4..5dec1de 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,25 @@ jobs:
       - run:
           command: yarn test
           environment:
-            DATABASE_URL: postgres://psqluer:psqlpassword@localhost:5432/psqluer
+            DATABASE_URL: postgres://$PG_USER:$PG_PASSWORD@localhost:5432/$PG_USER
+
+  back-test-e2e:
+    docker:
+      - image: circleci/node:lts-fermium
+      - image: circleci/postgres:9.6.5
+        environment:
+          POSTGRES_DB: $PG_USER
+          POSTGRES_USER: $PG_USER
+          POSTGRES_PASSWORD: $PG_PASSWORD
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependencies-{{ checksum "package.json" }}-v1
+      - run:
+          command: yarn test:e2e
+          environment:
+            DATABASE_URL: postgres://$PG_USER:$PG_PASSWORD@localhost:5432/$PG_USER
 
 workflows:
   version: 2