diff --git a/spec/support/devise.rb b/spec/support/devise.rb
index 7a474d18..f81e29d2 100644
--- a/spec/support/devise.rb
+++ b/spec/support/devise.rb
@@ -1,5 +1,5 @@
 require 'devise'
 
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :controller
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 57bdc98e..bbe53708 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -22,7 +22,7 @@ end
 module ActionController
   # Helper methods for controller tests
   class TestCase
-    include Devise::TestHelpers
+    include Devise::Test::ControllerHelpers
 
     def assert_assigns(method, assigned = {})
       get method