diff --git a/spec/v3/error_handling_spec.rb b/spec/v3/error_handling_spec.rb
index 8ab8c81f..33b3b762 100644
--- a/spec/v3/error_handling_spec.rb
+++ b/spec/v3/error_handling_spec.rb
@@ -1,5 +1,3 @@
-require 'sentry-raven'
-
 describe Travis::API::V3::ServiceIndex, set_app: true do
   let(:headers) {{  }}
   let(:path)      { "/v3/repo/1/enable"         }
@@ -13,22 +11,12 @@ describe Travis::API::V3::ServiceIndex, set_app: true do
 end
 
 describe Travis::API::V3::Router, set_app: true do
-  class FixRaven < Struct.new(:app)
-    def call(env)
-      requested_at = env['requested_at']
-      env['requested_at'] = env['requested_at'].to_s if env.key?('requested_at')
-      app.call(env)
-    rescue Exception => e
-      env['requested_at'] = requested_at
-      raise e
-    end
-  end
+  include Rack::Test::Methods
 
-  class TestError < StandardError
-  end
+  class TestError < StandardError; end
 
   before do
-    set_app Raven::Rack.new(FixRaven.new(app))
+    set_app Raven::Rack.new(app)
     Travis.config.sentry.dsn = "test"
     Travis::Api::App.setup_monitoring
   end