tests fails when I have models named Test*

Lighthouse Ticket here:
http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1776-models-named-test-cause-test-failures

This happens in Rails 2.1.1, I don't have access to 2.2 right now, but
if someone tells me it's fixed, I'll gladly upgrade. It's very easy to
reproduce:

  $ rails foo
  $ cd foo
  $ ./script/generate model test_something
  $ rake db:migrate
  $ rake test

    1) Error:
  test_somethings(ActionController::TestCase):
  ArgumentError: wrong number of arguments (0 for 1)
      /Library/Ruby/Gems/1.8/gems/actionpack-2.1.1/lib/
action_controller/test_case.rb:73:in `initialize'

I _really_ don't want to rename these models.

Thanks in advance,
Chris