diff --git a/.travis.yml b/.travis.yml
index 213fbaf1..332e3e53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,27 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - ree
   - jruby
-  - rbx
\ No newline at end of file
+  - rbx
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.edge-rails
+matrix:
+  exclude:
+    # Edge Rails is only compatible with 1.9.3
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: 1.8.7
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: 1.9.2
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: ree
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: jruby
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: rbx
+  allow_failures:
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: 1.9.3
diff --git a/gemfiles/Gemfile.edge-rails b/gemfiles/Gemfile.edge-rails
new file mode 100644
index 00000000..a8f7440c
--- /dev/null
+++ b/gemfiles/Gemfile.edge-rails
@@ -0,0 +1,9 @@
+source 'http://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'rails', github: 'rails/rails'
+
+# Current dependencies of edge rails
+gem 'journey', github: 'rails/journey'
+gem 'activerecord-deprecated_finders' , github: 'rails/activerecord-deprecated_finders'
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1ab0e162..c123764c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -21,8 +21,8 @@ module TestHelper
   Routes = ActionDispatch::Routing::RouteSet.new
   Routes.draw do
     resource :hypermedia
-    match ':controller(/:action(/:id))'
-    match ':controller(/:action)'
+    get ':controller(/:action(/:id))'
+    get ':controller(/:action)'
   end
 
   ActionController::Base.send :include, Routes.url_helpers