diff --git a/Gemfile b/Gemfile
index 9cef1b4c..da99c923 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,6 @@ gem 'travis-amqp',     github: 'travis-ci/travis-amqp'
 gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
-gem 'travis-migrations', github: 'travis-ci/travis-migrations'
 gem 'mustermann',      github: 'rkh/mustermann'
 gem 'sinatra'
 gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
@@ -37,6 +36,10 @@ gem 'stackprof'
 gem 'jemalloc'
 gem 'customerio'
 
+group :development, :test do
+  gem 'travis-migrations', github: 'travis-ci/travis-migrations'
+end
+
 group :test do
   gem 'rspec',         '~> 2.13'
   gem 'rspec-its'
diff --git a/Rakefile b/Rakefile
index 9fc70650..d9cb1796 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,16 +1,9 @@
 namespace :db do
-  if ENV["RAILS_ENV"] == 'test'
-    desc 'Create and migrate the test database'
-    task :create do
-      sh 'createdb travis_test' rescue nil
-      sh "psql -q travis_test < #{Gem.loaded_specs['travis-migrations'].full_gem_path}/db/structure.sql"
-    end
-  else
-    desc 'Create and migrate the development database'
-    task :create do
-      sh 'createdb travis_development' rescue nil
-      sh "psql -q travis_development < #{Gem.loaded_specs['travis-migrations'].full_gem_path}/db/structure.sql"
-    end
+  env = ENV["RAILS_ENV"]
+  desc "Create and migrate the #{env} database"
+  task :create do
+    sh "createdb travis_pro_#{env}" rescue nil
+    sh "psql -q travis_pro_#{env} < #{Gem.loaded_specs['travis-migrations'].full_gem_path}/db/structure.sql"
   end
 end