diff --git a/Rakefile b/Rakefile
index 9182837..0e3464a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -47,7 +47,7 @@ namespace :test do
   end
 
   Rake::TestTask.new(:functional) do |t|
-    t.test_files = FileList['test/test*.rb']
+    t.test_files = FileList['test/*_test.rb']
     t.verbose    = true
   end
 
diff --git a/test/test_admin.rb b/test/admin_test.rb
similarity index 100%
rename from test/test_admin.rb
rename to test/admin_test.rb
diff --git a/test/test_binary.rb b/test/binary_test.rb
similarity index 100%
rename from test/test_binary.rb
rename to test/binary_test.rb
diff --git a/test/test_bson.rb b/test/bson_test.rb
similarity index 100%
rename from test/test_bson.rb
rename to test/bson_test.rb
diff --git a/test/test_byte_buffer.rb b/test/byte_buffer_test.rb
similarity index 100%
rename from test/test_byte_buffer.rb
rename to test/byte_buffer_test.rb
diff --git a/test/test_chunk.rb b/test/chunk_test.rb
similarity index 100%
rename from test/test_chunk.rb
rename to test/chunk_test.rb
diff --git a/test/test_collection.rb b/test/collection_test.rb
similarity index 100%
rename from test/test_collection.rb
rename to test/collection_test.rb
diff --git a/test/test_connection.rb b/test/connection_test.rb
similarity index 100%
rename from test/test_connection.rb
rename to test/connection_test.rb
diff --git a/test/test_conversions.rb b/test/conversions_test.rb
similarity index 100%
rename from test/test_conversions.rb
rename to test/conversions_test.rb
diff --git a/test/test_cursor.rb b/test/cursor_test.rb
similarity index 100%
rename from test/test_cursor.rb
rename to test/cursor_test.rb
diff --git a/test/test_db_api.rb b/test/db_api_test.rb
similarity index 100%
rename from test/test_db_api.rb
rename to test/db_api_test.rb
diff --git a/test/test_db_connection.rb b/test/db_connection_test.rb
similarity index 100%
rename from test/test_db_connection.rb
rename to test/db_connection_test.rb
diff --git a/test/test_db.rb b/test/db_test.rb
similarity index 100%
rename from test/test_db.rb
rename to test/db_test.rb
diff --git a/test/test_grid_file_system.rb b/test/grid_file_system_test.rb
similarity index 100%
rename from test/test_grid_file_system.rb
rename to test/grid_file_system_test.rb
diff --git a/test/test_grid_io.rb b/test/grid_io_test.rb
similarity index 100%
rename from test/test_grid_io.rb
rename to test/grid_io_test.rb
diff --git a/test/test_grid_store.rb b/test/grid_store_test.rb
similarity index 100%
rename from test/test_grid_store.rb
rename to test/grid_store_test.rb
diff --git a/test/test_grid.rb b/test/grid_test.rb
similarity index 100%
rename from test/test_grid.rb
rename to test/grid_test.rb
diff --git a/test/test_objectid.rb b/test/objectid_test.rb
similarity index 100%
rename from test/test_objectid.rb
rename to test/objectid_test.rb
diff --git a/test/test_ordered_hash.rb b/test/ordered_hash_test.rb
similarity index 98%
rename from test/test_ordered_hash.rb
rename to test/ordered_hash_test.rb
index 90be0a1..31f4d0d 100644
--- a/test/test_ordered_hash.rb
+++ b/test/ordered_hash_test.rb
@@ -77,7 +77,7 @@ class OrderedHashTest < Test::Unit::TestCase
   end
 
   def test_to_a_order_preserved
-    assert_equal @ordered_keys, @oh.to_a.map(&:first)
+    assert_equal @ordered_keys, @oh.to_a.map {|m| m.first}
   end
 
   def test_order_preserved_after_replace
diff --git a/test/test_round_trip.rb b/test/round_trip_test.rb
similarity index 100%
rename from test/test_round_trip.rb
rename to test/round_trip_test.rb
diff --git a/test/test_slave_connection.rb b/test/slave_connection_test.rb
similarity index 100%
rename from test/test_slave_connection.rb
rename to test/slave_connection_test.rb
diff --git a/test/test_threading.rb b/test/threading_test.rb
similarity index 100%
rename from test/test_threading.rb
rename to test/threading_test.rb