diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7a0ac2f..3e942bb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,8 +9,17 @@ jobs:
           username: $DOCKER_ID
           password: $DOCKER_PASSWORD
         environment:
+          environment:
+          PIPENV_VENV_IN_PROJECT: true
+          DATABASE_URL: postgresql://myUsr:somePwd@localhost/psdb
+          CONDUIT_SECRET: $CONDUIT_SECRET
           FLASK_APP: ~/repo/autoapp.py
           FLASK_DEBUG: 1
+      - image: circleci/postgres:9.6.2
+        environment:
+          POSTGRES_USER: myUsr
+          POSTGRES_DB: psdb
+          POSTGRES_PASSWORD: somePwd
     steps:
       - checkout
       - run: sudo chown -R circleci:circleci /usr/local/bin
@@ -28,8 +37,12 @@ jobs:
       - run:
           command: pip install -r requirements/dev.txt --user
           name: Install requirements
-      - run: 
+      - run:
           command: pip install sqlalchemy --upgrade && pip install Flask-SQLAlchemy --upgrade
+      - run:
+          command: flask db upgrade
+      - run:
+          command: flask test
       - save_cache:
           key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }}
           paths:
@@ -54,17 +67,17 @@ jobs:
       - checkout
       - restore_cache:
           key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }}
-      - run: 
+      - run:
           name: Waiting for postgresql
           command : dockerize -wait tcp://localhost:5432 -timeout 1m
-      - run: 
+      - run:
           name: Launching tests
           command: |
             . venv/bin/activate
             flask db upgrade
             flask test
   deploy-heroku:
-    docker: 
+    docker:
       - image : buildpack-deps:trusty
     steps:
       - checkout
@@ -92,7 +105,7 @@ jobs:
           name: Build container
           command: |
             docker build --cache-from=app -t app .
-      - run: 
+      - run:
           name: Publish app to Docker hub
           command: |
             docker login -u $DOCKER_ID -p $DOCKER_PASSWORD