diff --git a/.travis.yml b/.travis.yml
index 839c7af73..ca3410ca3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,10 @@ services:
   - postgresql
 
 before_script:
-  - psql -c 'create extension pgcrypto;' -U postgres
-  - psql -c 'create extension hstore;' -U postgres
-  - psql -c 'create extension postgis;' -U postgres
-  - psql -c 'create database unit;' -U postgres
+#  - psql -c 'create extension pgcrypto;' -U postgres
+#  - psql -c 'create extension hstore;' -U postgres
+#  - psql -c 'create extension postgis;' -U postgres
+#  - psql -c 'create database unit;' -U postgres
   - ./.travis/setup_database
 
 env:
diff --git a/.travis/setup_database b/.travis/setup_database
index 7c605ec2d..8703c7296 100755
--- a/.travis/setup_database
+++ b/.travis/setup_database
@@ -2,13 +2,13 @@
 
 echo "\n=== SETUP DATABASE ===\n"
 
-set -e
-set -x
+#set -e
+#set -x
 
 # Setup postgres' users and databases
 sudo -u postgres psql -c "CREATE USER unit WITH PASSWORD 'unit';"
-sudo -u postgres psql -c 'CREATE DATABASE test WITH OWNER unit;'
-sudo -u postgres psql test -c 'CREATE EXTENSION hstore;'
-sudo -u postgres psql test -c 'CREATE EXTENSION pgcrypto;'
-sudo -u postgres psql test -c 'CREATE EXTENSION postgis;'
+sudo -u postgres psql -c 'CREATE DATABASE unit WITH OWNER unit;'
+sudo -u postgres psql unit -c 'CREATE EXTENSION hstore;'
+sudo -u postgres psql unit -c 'CREATE EXTENSION pgcrypto;'
+#sudo -u postgres psql test2 -c 'CREATE EXTENSION postgis;'
 
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 4bd971182..68c6665b5 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -110,8 +110,8 @@ datasource.ora.password=unit
 datasource.ora.databaseUrl=jdbc:oracle:thin:@//127.0.0.1:1521/orcl
 datasource.ora.databaseDriver=oracle.jdbc.driver.OracleDriver
 
-datasource.pg.username=postgres
-datasource.pg.password=
+datasource.pg.username=unit
+datasource.pg.password=unit
 datasource.pg.databaseUrl=jdbc:postgresql://127.0.0.1:5432/unit
 datasource.pg.databaseDriver=org.postgresql.Driver