diff --git a/.travis.yml b/.travis.yml
index 65742749..d7642653 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.0
+  - 2.4.9
+  - 2.5.8
+  - 2.6.6
 gemfile:
   - Gemfile
 script:
diff --git a/features/oauth2_mac_client.feature b/features/oauth2_mac_client.feature
index 133cf603..dd9cd026 100644
--- a/features/oauth2_mac_client.feature
+++ b/features/oauth2_mac_client.feature
@@ -2,6 +2,7 @@ Feature: Use OAuth2 MAC client as a test client
   Background:
     Given a file named "app_spec.rb" with:
       """
+      require "webmock/rspec"
       require "rspec_api_documentation"
       require "rspec_api_documentation/dsl"
       require "rack/builder"
diff --git a/lib/rspec_api_documentation/dsl/resource.rb b/lib/rspec_api_documentation/dsl/resource.rb
index f03a610b..150895d3 100644
--- a/lib/rspec_api_documentation/dsl/resource.rb
+++ b/lib/rspec_api_documentation/dsl/resource.rb
@@ -30,7 +30,7 @@ def self.define_action(method)
 
       def callback(*args, &block)
         begin
-          require 'webmock'
+          require 'webmock/rspec'
         rescue LoadError
           raise "Callbacks require webmock to be installed"
         end
diff --git a/lib/rspec_api_documentation/oauth2_mac_client.rb b/lib/rspec_api_documentation/oauth2_mac_client.rb
index e5ebcb26..596171a9 100644
--- a/lib/rspec_api_documentation/oauth2_mac_client.rb
+++ b/lib/rspec_api_documentation/oauth2_mac_client.rb
@@ -4,7 +4,7 @@
   # ActiveSupport::SecureRandom not provided in activesupport >= 3.2
 end
 begin
-  require "webmock"
+  require "webmock/rspec"
 rescue LoadError
   raise "Webmock needs to be installed before using the OAuth2MACClient"
 end
diff --git a/rspec_api_documentation.gemspec b/rspec_api_documentation.gemspec
index 59bb5128..20e1258d 100644
--- a/rspec_api_documentation.gemspec
+++ b/rspec_api_documentation.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 10.5.0"
   s.add_development_dependency "rack-test", "~> 0.6.3"
   s.add_development_dependency "rack-oauth2", "~> 1.2.2"
-  s.add_development_dependency "webmock", "~> 1.22.6"
+  s.add_development_dependency "webmock", "~> 3.8.3"
   s.add_development_dependency "rspec-its", "~> 1.2.0"
   s.add_development_dependency "faraday", "~> 0.9.2"
   s.add_development_dependency "nokogiri", "~> 1.8.4"
diff --git a/spec/http_test_client_spec.rb b/spec/http_test_client_spec.rb
index f93b549e..fd77dc0f 100644
--- a/spec/http_test_client_spec.rb
+++ b/spec/http_test_client_spec.rb
@@ -3,7 +3,7 @@
 require 'capybara'
 require 'capybara/server'
 require 'sinatra/base'
-require 'webmock'
+require 'webmock/rspec'
 require 'support/stub_app'
 
 describe RspecApiDocumentation::HttpTestClient do