diff --git a/.travis.yml b/.travis.yml
index acdce6dc..bc3c9cf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ rvm:
 - 2.2.5
 - 2.3.4
 - 2.4.1
+- 2.5.0
 - jruby
 - rbx-2
 matrix:
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 24362565..ee37c8b7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,10 +1,10 @@
 
 if ENV['COVERAGE']
-    require 'simplecov'
-    SimpleCov.start
+  require 'simplecov'
+  SimpleCov.start
 end
 
-if ENV['TRAVIS'] && Object.const_defined?(:RUBY_ENGINE) && RUBY_ENGINE == "ruby"
+if ENV['TRAVIS'] && Object.const_defined?(:RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
   require 'coveralls'
   Coveralls.wear!
 end
@@ -18,15 +18,20 @@
 
 require 'algoliasearch'
 require 'rspec'
-
 require 'webmock/rspec'
-WebMock.disable!
-
 require 'algolia/webmock'
 
-raise "missing ALGOLIA_APPLICATION_ID or ALGOLIA_API_KEY environment variables" if ENV['ALGOLIA_APPLICATION_ID'].nil? || ENV['ALGOLIA_API_KEY'].nil?
+raise 'missing ALGOLIA_APPLICATION_ID or ALGOLIA_API_KEY environment variables' if ENV['ALGOLIA_APPLICATION_ID'].nil? || ENV['ALGOLIA_API_KEY'].nil?
 Algolia.init :application_id => ENV['ALGOLIA_APPLICATION_ID'], :api_key => ENV['ALGOLIA_API_KEY']
 
-RSpec.configure do |c|
-  c.mock_with :rspec
+RSpec.configure do |config|
+  config.mock_with :rspec
+
+  config.before(:suite) do
+    WebMock.disable!
+  end
+
+  config.after(:suite) do
+    WebMock.disable!
+  end
 end