diff --git a/.gitignore b/.gitignore
index 8289c96816..f656f67078 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,6 @@
 # Ignore spec/examples.txt
 spec/examples.txt
 
-#Ignore phantomjs linux file
-phantomjs-2.1.1-linux-x86_64.tar.bz2
-
 # Ignore all logfiles and tempfiles.
 /log/*
 !/log/.keep
diff --git a/config/mongoid.yml b/config/mongoid.yml
index fdd867de61..caf9ec3e74 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -11,10 +11,12 @@ development:
 test:
   clients:
     default:
-      database: oscar_history_test
+      database: <%= ENV['HISTORY_DATABASE_NAME'] %>
       hosts:
-        - localhost:27017
+        - mongo:27017
       options:
+        user: <%= ENV['DATABASE_USER'] %>
+        password: <%= ENV['DATABASE_PASSWORD'] %>
         read:
           mode: :primary
         max_pool_size: 1