diff --git a/.circleci/config.yml b/.circleci/config.yml
index c1f60a8..4f13c30 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,7 +57,7 @@ jobs:
         environment:
           POSTGRES_USER: myUsr  
           POSTGRES_PASSOWRD: somePwd 
-          POSTGRES_DB: myUsr
+          POSTGRES_DB: bdtest
 
     working_directory: ~/repo
 
@@ -72,11 +72,13 @@ jobs:
             # fallback to using the latest cache if no exact match is found
     
       - run:
-          name: bd upgrade 
+          name: bd upgrade & test
           command: |
             . venv/bin/activate
             sleep 1
             flask db upgrade
+            sleep 1
+            flask test
           environment:
             CONDUIT_SECRET: 'something-really-secret'
             FLASK_APP: /home/circleci/repo/autoapp.py
@@ -87,17 +89,6 @@ jobs:
             POSTGRES_PASSWORD: somePwd
             POSTGRES_PORT: 5432
 
-      - run:
-          name: run tests
-          command: |
-            . venv/bin/activate
-            flask test
-          environment:
-            CONDUIT_SECRET: 'something-really-secret'
-            FLASK_APP: /home/circleci/repo/autoapp.py
-            FLASK_DEBUG: 1
-            DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/bdtest
-          
       - save_cache:
           paths:
             - venv