diff --git a/.travis.yml b/.travis.yml
index b826cb7..8a42c15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,17 @@
 language: ruby
 sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
-  - jruby
-  - jruby-9.1.5.0
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - jruby-9.1.10.0
 gemfile:
   - Gemfile
   - Gemfile.rails-3.2
   - Gemfile.rails-4.2
+  - Gemfile.rails-5.1
 matrix:
   exclude:
-    - rvm: 1.9.3
-      gemfile: Gemfile
-    - rvm: 2.0.0
-      gemfile: Gemfile
-    - rvm: 2.1.9
-      gemfile: Gemfile
-    - rvm: jruby
-      gemfile: Gemfile
+    - rvm: 2.1.10
+      gemfile: Gemfile.rails-5.1 # rails 5 needs ruby >= 2.2.2
diff --git a/Gemfile.rails-5.1 b/Gemfile.rails-5.1
new file mode 100644
index 0000000..f54ce1a
--- /dev/null
+++ b/Gemfile.rails-5.1
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'activesupport', '~> 5.1.0'
+gem 'actionpack', '~> 5.1.0'
diff --git a/lib/rack/tracker/controller.rb b/lib/rack/tracker/controller.rb
index a565557..801a52a 100644
--- a/lib/rack/tracker/controller.rb
+++ b/lib/rack/tracker/controller.rb
@@ -3,7 +3,7 @@ class Tracker
     module Controller
       def tracker(&block)
         if block_given?
-          yield(Rack::Tracker::HandlerDelegator.new(env))
+          yield(Rack::Tracker::HandlerDelegator.new(respond_to?(:request) ? request.env : env))
         end
       end
     end