diff --git a/.travis.yml b/.travis.yml
index 8031ac51d..73e120a5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,10 @@
 ---
 language: ruby
 bundler_args: --without development assets
-env: RAILS_ENV=travis GROWSTUFF_SITE_NAME="Growstuff (travis)"
+env: GROWSTUFF_SITE_NAME="Growstuff (travis)"
 rvm:
   - 2.1.1
-before_script:
-  - psql -c 'create database growstuff_test;' -U postgres
+# - psql -c 'create database growstuff_test;' -U postgres
 script:
   - bundle exec rake db:migrate --trace
   - bundle exec rspec spec/
-
-# after_success:
-# - if [[ "$TRAVIS_BRANCH" == "dev" ]]; then git remote add heroku git@heroku.com:growstuff-dev.git
-# - wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh
-# - echo "Host heroku.com" >> ~/.ssh/config
-# - echo "   StrictHostKeyChecking no" >> ~/.ssh/config
-# - echo "   CheckHostIP no" >> ~/.ssh/config
-# - echo "   UserKnownHostsFile=/dev/null" >> ~/.ssh/config
-# - heroku keys:clear
-# - yes | heroku keys:add
-# - yes | git push heroku dev:master
-# - heroku run rake db:migrate
-# - heroku restart
-# - fi
-
-# env:
-# global:
-# secure: "QFQbCdNGyjeatp/H0j0y0oGiue45fpG2w6eA2QAbq2RmvhabgXbd5WIobN90\ndrae3S7TRxPDpMpus90icykX6EzOTLXCEvaC4rh9pCcRktj3SZqq5b9rVTvs\n1MvlS6HhtsVqsrKjQUb0WmPpnganIzTs0RtGaQspo2joPJO18A4="
diff --git a/Gemfile b/Gemfile
index b18430504..f64d2ed24 100644
--- a/Gemfile
+++ b/Gemfile
@@ -117,7 +117,7 @@ gem 'omniauth-flickr', '>= 0.0.15'
 
 gem 'rake', '>= 10.0.0'
 
-group :development, :test, :travis do
+group :development, :test do
   gem 'haml-rails'                   # HTML templating language
   gem 'rspec-rails', '~> 2.12.1'     # unit testing framework
   gem 'webrat'                       # provides HTML matchers for view tests
diff --git a/config/database.yml b/config/database.yml
index 10a2ea0e8..cc4e851d8 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -8,12 +8,6 @@ test:
   database: growstuff_test
   host: localhost
 
-# should be identical to test apart from running on postgres
-travis:
-  adapter: postgresql
-  database: growstuff_test
-  username: postgres
-
 production:
   adapter: postgresql
   database: growstuff_prod
diff --git a/config/environments/travis.rb b/config/environments/travis.rb
deleted file mode 120000
index 2e82190dd..000000000
--- a/config/environments/travis.rb
+++ /dev/null
@@ -1 +0,0 @@
-test.rb
\ No newline at end of file