diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 22a17a62af..392b717e0a 100644
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -62,7 +62,9 @@ end
     adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z]+/]
     puts [adapter, adapter_short, connection_path].inspect
     ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-    Dir["test/cases/**/*_test{,_#{adapter_short}}.rb"].all? do |file|
+    (Dir["test/cases/**/*_test.rb"].reject {
+      |x| x =~ /\/adapters\//
+    } + Dir["test/cases/adapters/#{adapter_short}/**/*_test.rb"]).all? do |file|
       system(ruby, "-Ilib:test:#{connection_path}", file)
     end or raise "Failures"
   end