diff --git a/spec/custom_spec_helper.rb b/spec/custom_spec_helper.rb
new file mode 100644
index 000000000..b6ddad332
--- /dev/null
+++ b/spec/custom_spec_helper.rb
@@ -0,0 +1,9 @@
+RSpec.configure do |config|
+  # Add the :consul tag to tests which make sense in the original
+  # version of CONSUL but don't make sense in your application due to
+  # the custom changes you've implemented.
+  #
+  # Using this tag will help maintaining the test suite when doing
+  # custom changes and when upgrading to a newer version of CONSUL
+  config.filter_run_excluding consul: true
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 6714ebdb4..5d8e11d91 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -8,6 +8,7 @@ abort("The Rails environment is running in production mode!") if Rails.env.produ
 
 require "rspec/rails"
 require "spec_helper"
+require "custom_spec_helper"
 require "capybara/rails"
 require "capybara/rspec"
 require "selenium/webdriver"