diff --git a/.env b/.env
index ebfb4136..d8d063bf 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 COMPOSE_PROJECT_NAME=operationcodebackend
 REDIS_URL=redis://redis:6379/0
-#RAILS_ENV=development
+RAILS_ENV=development
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 14c0f91b..7cf89219 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,11 @@ 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 346a360e..557c686f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,3 +17,5 @@ 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 d49042b3..f4ae6c45 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,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 'RAILS_ENV=test bin/rails db:environment:set && rake db:test:prepare && RAILS_ENV=test bin/rails db:environment:set && rake test'
+	docker-compose run ${RAILS_CONTAINER} bash -c 'export RAILS_ENV=test && rake db:test:prepare && rake test'
 
 .PHONY: bundle
 bundle:
diff --git a/docker-compose.yml b/docker-compose.yml
index 06279365..46a7b2db 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,7 @@ version: '2'
 services:
   web:
     build: .
-    entrypoint: ["lib/docker-entrypoint.sh"]
-    command: ["bundle", "exec", "puma", "-C", "config/puma.rb"]
+    command: bundle exec puma -C config/puma.rb
     volumes:
       - .:/app
     volumes_from:
@@ -42,3 +41,4 @@ services:
       - redis
     env_file:
       - .env
+
diff --git a/lib/docker-entrypoint.sh b/lib/docker-entrypoint.sh
deleted file mode 100755
index 76bd2645..00000000
--- a/lib/docker-entrypoint.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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
deleted file mode 100644
index bb5c676b..00000000
--- a/test/lib/verify_db_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-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