diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index c54731e121..0faf6c0750 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -31,9 +31,9 @@ for adapter in %w( mysql postgresql sqlite sqlite3 firebird sqlserver sqlserver_
   Rake::TestTask.new("test_#{adapter}") { |t|
     t.libs << "test" << "test/connections/native_#{adapter}"
     if adapter =~ /^sqlserver/
-      t.pattern = "test/*_test{,_sqlserver}.rb"
+      t.pattern = "test/**/*_test{,_sqlserver}.rb"
     else
-      t.pattern = "test/*_test{,_#{adapter}}.rb"
+      t.pattern = "test/**/*_test{,_#{adapter}}.rb"
     end
     t.verbose = true
   }
diff --git a/activerecord/test/association_callbacks_test.rb b/activerecord/test/associations/callbacks_test.rb
similarity index 100%
rename from activerecord/test/association_callbacks_test.rb
rename to activerecord/test/associations/callbacks_test.rb
diff --git a/activerecord/test/associations_cascaded_eager_loading_test.rb b/activerecord/test/associations/cascaded_eager_loading_test.rb
similarity index 100%
rename from activerecord/test/associations_cascaded_eager_loading_test.rb
rename to activerecord/test/associations/cascaded_eager_loading_test.rb
diff --git a/activerecord/test/associations_go_eager_test.rb b/activerecord/test/associations/eager_test.rb
similarity index 100%
rename from activerecord/test/associations_go_eager_test.rb
rename to activerecord/test/associations/eager_test.rb
diff --git a/activerecord/test/associations_extensions_test.rb b/activerecord/test/associations/extension_test.rb
similarity index 100%
rename from activerecord/test/associations_extensions_test.rb
rename to activerecord/test/associations/extension_test.rb
diff --git a/activerecord/test/associations_join_model_test.rb b/activerecord/test/associations/join_model_test.rb
similarity index 100%
rename from activerecord/test/associations_join_model_test.rb
rename to activerecord/test/associations/join_model_test.rb