diff --git a/.travis.yml b/.travis.yml
index 9111783d1..a13da5608 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,4 @@ branches:
     - rails3
 before_script:
   - "mysql -e 'create database thinking_sphinx;' > /dev/null"
+  - "psql -c 'create database thinking_sphinx;' -U postgres >/dev/null"
diff --git a/lib/cucumber/thinking_sphinx/internal_world.rb b/lib/cucumber/thinking_sphinx/internal_world.rb
index 24c43e2ef..3e26f41f5 100644
--- a/lib/cucumber/thinking_sphinx/internal_world.rb
+++ b/lib/cucumber/thinking_sphinx/internal_world.rb
@@ -18,7 +18,7 @@ def initialize
 
         @adapter  = (ENV['DATABASE'] || 'mysql').gsub /^mysql$/, 'mysql2'
         @database = 'thinking_sphinx'
-        @username = 'root'
+        @username = @adapter[/mysql/] ? 'root' : 'postgres'
         # @password = 'thinking_sphinx'
         @host     = 'localhost'
       end