diff --git a/.travis.yml b/.travis.yml
index d00ec13..0cc9fb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,19 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.0
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
+  - 2.4.1
+  - 2.3.4
+  - 2.2.2
 gemfile:
-  - gemfiles/Gemfile-rails.3.1.x
-  - gemfiles/Gemfile-rails.3.2.x
-  - gemfiles/Gemfile-rails.4.0.x
   - gemfiles/Gemfile-rails.4.1.x
+  - gemfiles/Gemfile-rails.4.2.x
+  - gemfiles/Gemfile-rails.5.0.x
+  - gemfiles/Gemfile-rails.5.1.x
 before_script:
-  - "cd test/dummy; rake db:migrate; rake db:test:prepare; cd ../.."
+  - "cd test/dummy; bundle exec rake db:migrate; bundle exec rake db:test:prepare; cd ../.."
 notifications:
   email: false
+matrix:
+  exclude:
+    - rvm: 2.4.1
+      gemfile: gemfiles/Gemfile-rails.4.1.x
diff --git a/gemfiles/Gemfile-rails.3.1.x b/gemfiles/Gemfile-rails.4.2.x
similarity index 95%
rename from gemfiles/Gemfile-rails.3.1.x
rename to gemfiles/Gemfile-rails.4.2.x
index 76b4678..6c71a53 100644
--- a/gemfiles/Gemfile-rails.3.1.x
+++ b/gemfiles/Gemfile-rails.4.2.x
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "gretel",  :path => ".."
 
-gem "rails", "~> 3.1.0"
+gem "rails", "~> 4.2.0"
 gem "sqlite3"
 
 # jquery-rails is used by the dummy application
@@ -17,3 +17,4 @@ gem "jquery-rails"
 # gem 'debugger'
 
 gem 'test-unit', '~> 3.0' if RUBY_VERSION >= "2.2"
+
diff --git a/gemfiles/Gemfile-rails.4.0.x b/gemfiles/Gemfile-rails.5.0.x
similarity index 95%
rename from gemfiles/Gemfile-rails.4.0.x
rename to gemfiles/Gemfile-rails.5.0.x
index 6e4bc06..f383163 100644
--- a/gemfiles/Gemfile-rails.4.0.x
+++ b/gemfiles/Gemfile-rails.5.0.x
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "gretel",  :path => ".."
 
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 5.0.0"
 gem "sqlite3"
 
 # jquery-rails is used by the dummy application
@@ -17,3 +17,4 @@ gem "jquery-rails"
 # gem 'debugger'
 
 gem 'test-unit', '~> 3.0' if RUBY_VERSION >= "2.2"
+
diff --git a/gemfiles/Gemfile-rails.3.2.x b/gemfiles/Gemfile-rails.5.1.x
similarity index 79%
rename from gemfiles/Gemfile-rails.3.2.x
rename to gemfiles/Gemfile-rails.5.1.x
index a3076cf..57c7d98 100644
--- a/gemfiles/Gemfile-rails.3.2.x
+++ b/gemfiles/Gemfile-rails.5.1.x
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "gretel",  :path => ".."
 
-gem "rails", "~> 3.2.0"
+gem "rails", github: "rails/rails", branch: "5-1-stable"
 gem "sqlite3"
 
 # jquery-rails is used by the dummy application
@@ -16,4 +16,5 @@ gem "jquery-rails"
 # To use debugger
 # gem 'debugger'
 
-gem 'test-unit', '~> 3.0' if RUBY_VERSION >= "2.2"
\ No newline at end of file
+gem 'test-unit', '~> 3.0' if RUBY_VERSION >= "2.2"
+
diff --git a/gretel.gemspec b/gretel.gemspec
index 0896c09..8a647d9 100644
--- a/gretel.gemspec
+++ b/gretel.gemspec
@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^test/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "rails", ">= 3.1.0"
+  gem.add_dependency "rails", ">= 4.1.0", "<= 5.1.0rc1"
   gem.add_development_dependency "sqlite3"
 end
diff --git a/test/dummy/db/migrate/20130122163007_create_projects.rb b/test/dummy/db/migrate/20130122163007_create_projects.rb
index 3c79c31..17f883e 100644
--- a/test/dummy/db/migrate/20130122163007_create_projects.rb
+++ b/test/dummy/db/migrate/20130122163007_create_projects.rb
@@ -1,4 +1,4 @@
-class CreateProjects < ActiveRecord::Migration
+class CreateProjects < ActiveRecord::Migration[4.1]
   def change
     create_table :projects do |t|
       t.string :name
diff --git a/test/dummy/db/migrate/20130122163051_create_issues.rb b/test/dummy/db/migrate/20130122163051_create_issues.rb
index e3d0e11..ae48622 100644
--- a/test/dummy/db/migrate/20130122163051_create_issues.rb
+++ b/test/dummy/db/migrate/20130122163051_create_issues.rb
@@ -1,4 +1,4 @@
-class CreateIssues < ActiveRecord::Migration
+class CreateIssues < ActiveRecord::Migration[4.1]
   def change
     create_table :issues do |t|
       t.string :title