diff --git a/.env b/.env
index d8d063bf..ebfb4136 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 COMPOSE_PROJECT_NAME=operationcodebackend
 REDIS_URL=redis://redis:6379/0
-RAILS_ENV=development
\ No newline at end of file
+#RAILS_ENV=development
diff --git a/.travis.yml b/.travis.yml
index 7cf89219..14c0f91b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,6 @@ services:
 
 script:
   - make build
-  - |
-    while ! psql --host=localhost --username=postgres -c 'SELECT 1'> /dev/null 2>&1; do
-      echo 'Waiting for postgres...'
-      sleep 1;
-    done;
   - make test
   - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then make upgrade; fi
 
diff --git a/Dockerfile b/Dockerfile
index 557c686f..346a360e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,5 +17,3 @@ ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
 RUN bundle install --system
 
 ADD . $APP_HOME/
-
-CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]
diff --git a/Makefile b/Makefile
index 386d39e7..7c598d6f 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ db_seed:
 .PHONY: test
 test: bg
 	docker-compose run operationcode-psql bash -c "while ! psql --host=operationcode-psql --username=postgres -c 'SELECT 1'; do sleep 5; done;"
-	docker-compose run ${RAILS_CONTAINER} bash -c 'export RAILS_ENV=test && rake db:test:prepare && rake test'
+	docker-compose run ${RAILS_CONTAINER} bash -c 'RAILS_ENV=test bin/rails db:environment:set && rake db:test:prepare && RAILS_ENV=test bin/rails db:environment:set && rake test'
 
 .PHONY: bundle
 bundle:
diff --git a/docker-compose.yml b/docker-compose.yml
index 46a7b2db..06279365 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,8 @@ version: '2'
 services:
   web:
     build: .
-    command: bundle exec puma -C config/puma.rb
+    entrypoint: ["lib/docker-entrypoint.sh"]
+    command: ["bundle", "exec", "puma", "-C", "config/puma.rb"]
     volumes:
       - .:/app
     volumes_from:
@@ -41,4 +42,3 @@ services:
       - redis
     env_file:
       - .env
-
diff --git a/lib/docker-entrypoint.sh b/lib/docker-entrypoint.sh
new file mode 100755
index 00000000..76bd2645
--- /dev/null
+++ b/lib/docker-entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+bundle exec rake db:migrate || bundle exec rake db:setup
+
+exec bundle exec "$@"
diff --git a/test/lib/verify_db_test.rb b/test/lib/verify_db_test.rb
new file mode 100644
index 00000000..bb5c676b
--- /dev/null
+++ b/test/lib/verify_db_test.rb
@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class VerifyDbTest < ActiveSupport::TestCase
+
+  test 'verify test database' do
+    #Check that the correct database used for testing
+    query = "SELECT * FROM ar_internal_metadata"
+    sql = ActiveRecord::Base.connection.execute(query).first
+    assert_equal("test", sql["value"] )
+  end
+
+end