diff --git a/.circleci/config.yml b/.circleci/config.yml
index 226bd96..87e50e3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,13 +1,8 @@
-
 version: 2
 jobs:
   build:
     docker:
       - image: circleci/python:latest
-        environment:
-          FLASK_CONFIG: testing
-          TEST_DATABASE_URL: postgresql://root@localhost/circle_test?sslmode=disable
-          
     steps:
       - checkout
       - restore_cache:
@@ -26,28 +21,24 @@ jobs:
 
 
   test:
-    docker: 
+    docker:
       - image: circleci/python:latest
         environment:
+          DATABASE_URL: postgresql://ubuntu@localhost/circle_test?sslmode=disable
           CONDUIT_SECRET: 'something-really-secret'
-          FLASK_APP: /path/to/autoapp.py
+          FLASK_APP: autoapp.py
           FLASK_DEBUG: 1
-          TEST_DATABASE_URL: postgresql://root@localhost/circle_test?sslmode=disable
-      
-      - image: circleci/postgres:9.6.5-alpine-ram
-        auth:
-          username: mydockerhub-user
-          password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
+      - image: circleci/postgres:9.6.9-alpine
         environment:
-          POSTGRES_USER: root
-          POSTGRES_DB: circle_test
-          POSTGRES_PASSWORD: ""
-          
+          POSTGRES_USER: ubuntu
+          POSTGRES_PASSWORD: circle_test
+          POSTGRES_BD: ""
     steps:
-        - checkout
-        - restore_cache:
+      - checkout
+      - restore_cache:
           key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }}
-        - run:
+      
+      - run:
           name: Tests Flask
           command: |
             . venv/bin/activate
@@ -55,11 +46,6 @@ jobs:
             flask db migrate
             flask db upgrade
             flask test
-        - save_cache:
-          key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }}
-          paths:
-            - "venv"
-