diff --git a/features/support/env.rb b/features/support/env.rb
index b46667cfc22e4e289f6fdd3c9b042738fda40ccb..1690465d9b29fee5ce40846ea98908ed1f9908c6 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -32,7 +32,6 @@ end
 
 Spinach.hooks.after_scenario do |scenario_data, step_definitions|
   if scenario_data.tags.include?('javascript')
-    include Capybara::DSL
     include WaitForRequests
     block_and_wait_for_requests_complete
   end
diff --git a/spec/support/wait_for_requests.rb b/spec/support/wait_for_requests.rb
index ebdc62e4bca5e94d3198707676077bac877a7da9..4712ecc658c9649dd7bb0f100538665e6b16249d 100644
--- a/spec/support/wait_for_requests.rb
+++ b/spec/support/wait_for_requests.rb
@@ -3,6 +3,8 @@ require_relative './wait_for_requests'
 module WaitForRequests
   extend self
 
+  include Capybara::DSL
+
   # This is inspired by http://www.salsify.com/blog/engineering/tearing-capybara-ajax-tests
   def block_and_wait_for_requests_complete
     Gitlab::Testing::RequestBlockerMiddleware.block_requests!