1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index c885221f10..b2d3f8c986 100755
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -20,7 +20,10 @@ task :default => [ :test ]
 
 Rake::TestTask.new { |t|
   t.libs << "test"
-  t.pattern = 'test/*/*_test.rb'
+# make sure we include the controller tests (c*) first as on some systems
+# this will not happen automatically and the tests (as a whole) will error
+  t.test_files=Dir.glob( "test/c*/*_test.rb" ) + Dir.glob( "test/[ft]*/*_test.rb" )
+#  t.pattern = 'test/*/*_test.rb'
   t.verbose = true
 }
 
@@ -104,4 +107,4 @@ task :lines do
     end
   }
   puts "Lines #{lines}, LOC #{codelines}"
-end
-\ No newline at end of file
+end