diff --git a/.travis.yml b/.travis.yml
index 913fe9d9..46764748 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,15 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - ruby-head
   - jruby
   - rbx-2
-gemfile:
-  - Gemfile
-  - Gemfile.rails3
-  - Gemfile.edge
+env:
+  - "RAILS_VERSION=3.2.17"
+  - "RAILS_VERSION=4.0.3"
+  - "RAILS_VERSION=4.1.0.rc1"
+  - "RAILS_VERSION=master"
 matrix:
   allow_failures:
     - rvm: ruby-head
diff --git a/Gemfile b/Gemfile
index a5b2c5f7..e71acd3d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,4 +17,15 @@ platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
-gem 'rails', '~> 4.0.0'
+version = ENV["RAILS_VERSION"] || "4.0.2"
+rails = case version
+        when "master"
+          {:github => "rails/rails"}
+        else
+          "~> #{version}"
+        end
+gem "rails", rails
+
+if version < "4"
+  gem "minitest", "~> 4.7.5"
+end
diff --git a/Gemfile.edge b/Gemfile.edge
deleted file mode 100644
index 684de332..00000000
--- a/Gemfile.edge
+++ /dev/null
@@ -1,20 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-platforms :ruby do
-  gem 'sqlite3', '1.3.8'
-end
-
-platforms :mri do
-  gem 'coveralls', require: false
-  gem 'simplecov', require: false
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-# Use Rails master + current dependencies
-gem 'rails', github: 'rails/rails'
-gem 'arel', github: 'rails/arel'
diff --git a/Gemfile.rails3 b/Gemfile.rails3
deleted file mode 100644
index ac98e974..00000000
--- a/Gemfile.rails3
+++ /dev/null
@@ -1,19 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-platforms :ruby do
-  gem 'sqlite3', '1.3.8'
-end
-
-platforms :mri do
-  gem 'coveralls', require: false
-  gem 'simplecov', require: false
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-gem 'minitest', '~> 4.0'
-gem 'rails', '~> 3.2'