diff --git a/Rakefile b/Rakefile
index c292042..866c3dd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,5 @@
 
-PKG_REVISION = ".1"
+PKG_REVISION = ".2"
 
 $:.unshift "lib" if File.directory? "lib"
 require 'rcodetools/xmpfilter'
diff --git a/lib/ruby_toggle_file.rb b/lib/ruby_toggle_file.rb
index 18ee706..a2843fc 100644
--- a/lib/ruby_toggle_file.rb
+++ b/lib/ruby_toggle_file.rb
@@ -18,7 +18,7 @@ def ruby_toggle_file(file)
   end
 
   LIB_RE = %r!/lib/(.+)\.rb$!
-  TEST_RE = %r!/test/(.+/)?test_(.+)\.rb$!
+  TEST_RE = %r!/test/(.+/)?(.+)_test\.rb$!
 
   def test_file(implementation)
     if m = LIB_RE.match(implementation)
@@ -68,8 +68,8 @@ def test_file_30_flat(implementation, basedir, dir, node) # lib/XXX/NODE.rb -> t
     exist "#{basedir}test/test_#{node}.rb" if dir
   end
 
-  def test_file_99_autotest_default(implementation, basedir, dir, node) # lib/XXX/NODE.rb -> test/XXX/test_NODE.rb
-    "#{basedir}test/#{dir}test_#{node}.rb"
+  def test_file_99_default(implementation, basedir, dir, node) # lib/XXX/NODE.rb -> test/XXX/test_NODE.rb
+    "#{basedir}test/#{dir}#{node}_test.rb"
   end
 
   def implementation_file_00_rails(test, basedir, dir, node)