diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/dispatch/cookies_test.rb
similarity index 99%
rename from actionpack/test/controller/cookie_test.rb
rename to actionpack/test/dispatch/cookies_test.rb
index f65eda5c69e9b00fb7126605df7546ec01bd5419..8c9183e454bf582963f46e78a19366dfbecfb9dd 100644
--- a/actionpack/test/controller/cookie_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class CookieTest < ActionController::TestCase
+class CookiesTest < ActionController::TestCase
   class TestController < ActionController::Base
     def authenticate
       cookies["user_name"] = "david"
@@ -225,4 +225,4 @@ def assert_cookie_header(expected)
         assert_equal expected.split("\n"), header
       end
     end
-end
+end
\ No newline at end of file