diff --git a/bin/travis-build b/bin/travis-build
index 4b373e62a1c..82a72bc62be 100755
--- a/bin/travis-build
+++ b/bin/travis-build
@@ -16,7 +16,7 @@ sudo apt-get update -qq
 sudo apt-get install solr-jetty postgresql-$PGVERSION
 
 # Don't require a password to access DB
-sudo sed -i -e 's/ident/trust/g' /etc/postgresql/$PGVERSION/main/pg_hba.conf 
+sudo sed -i -e 's/ident/trust/g' /etc/postgresql/$PGVERSION/main/pg_hba.conf
 
 sudo service postgresql reload
 
@@ -24,7 +24,7 @@ pip install -r pip-requirements.txt --use-mirrors
 pip install -r pip-requirements-test.txt --use-mirrors
 
 psql -c 'CREATE DATABASE ckan_test;' -U postgres
-psql -c 'CREATE DATABASE datastore;' -U postgres
+psql -c 'CREATE DATABASE ckan_test_datastore;' -U postgres
 
 python setup.py develop
 
@@ -32,7 +32,7 @@ python setup.py develop
 sed -i -e 's/.*solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' test-core.ini
 sed -i -e 's/.*ckan\.site_id.*/ckan.site_id = travis_ci/' test-core.ini
 sed -i -e 's/^sqlalchemy.url.*/sqlalchemy.url = postgresql:\/\/postgres@\/ckan_test/' test-core.ini
-sed -i -e 's/.*datastore.write_url.*/ckan.datastore.write_url = postgresql:\/\/postgres@\/datastore/' test-core.ini
+sed -i -e 's/.*datastore.write_url.*/ckan.datastore.write_url = postgresql:\/\/postgres@\/ckan_test_datastore/' test-core.ini
 
 # Configure Solr
 echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty
@@ -46,7 +46,7 @@ paster db init -c test-core.ini
 if [ $PGVERSION != '8.4' ]
 then
   psql -c 'CREATE USER readonlyuser;' -U postgres
-  sed -i -e 's/.*datastore.read_url.*/ckan.datastore.read_url = postgresql:\/\/readonlyuser@\/datastore/' test-core.ini
+  sed -i -e 's/.*datastore.read_url.*/ckan.datastore.read_url = postgresql:\/\/readonlyuser@\/ckan_test_datastore/' test-core.ini
   paster datastore set-permissions postgres -c test-core.ini
 fi