3 files changed, 15 insertions, 11 deletions
diff --git a/test/fileutils/test_dryrun.rb b/test/fileutils/test_dryrun.rb
index 85badbdb06..f4672779a1 100644
--- a/test/fileutils/test_dryrun.rb
+++ b/test/fileutils/test_dryrun.rb
@@ -9,14 +9,15 @@ class TestFileUtilsDryRun < Test::Unit::TestCase
   include FileUtils::DryRun
   include TestFileUtils::Clobber
 
-  def test_visibility
-    FileUtils::METHODS.each do |m|
+  FileUtils::METHODS.each do |m|
+    define_method "test_singleton_visibility_#{m}" do
       assert_equal true, FileUtils::DryRun.respond_to?(m, true),
                    "FileUtils::DryRun.#{m} not defined"
       assert_equal true, FileUtils::DryRun.respond_to?(m, false),
                    "FileUtils::DryRun.#{m} not public"
     end
-    FileUtils::METHODS.each do |m|
+
+    define_method "test_instance_visibility_#{m}" do
       assert_equal true, respond_to?(m, true),
                    "FileUtils::DryRun\##{m} is not defined"
       assert_equal true, FileUtils::DryRun.private_method_defined?(m),
diff --git a/test/fileutils/test_nowrite.rb b/test/fileutils/test_nowrite.rb
index 8ca9e89fa7..002f25620d 100644
--- a/test/fileutils/test_nowrite.rb
+++ b/test/fileutils/test_nowrite.rb
@@ -9,18 +9,20 @@ class TestFileUtilsNoWrite < Test::Unit::TestCase
   include FileUtils::NoWrite
   include TestFileUtils::Clobber
 
-  def test_visibility
-    FileUtils::METHODS.each do |m|
+  FileUtils::METHODS.each do |m|
+    define_method "test_singleton_visibility_#{m}" do
       assert_equal true, FileUtils::NoWrite.respond_to?(m, true),
                    "FileUtils::NoWrite.#{m} is not defined"
       assert_equal true, FileUtils::NoWrite.respond_to?(m, false),
                    "FileUtils::NoWrite.#{m} is not public"
     end
-    FileUtils::METHODS.each do |m|
+
+    define_method "test_instance_visibility_#{m}" do
       assert_equal true, respond_to?(m, true),
                    "FileUtils::NoWrite\##{m} is not defined"
       assert_equal true, FileUtils::NoWrite.private_method_defined?(m),
                    "FileUtils::NoWrite\##{m} is not private"
     end
   end
+
 end
diff --git a/test/fileutils/test_verbose.rb b/test/fileutils/test_verbose.rb
index e60e85ea4e..cf46fa9260 100644
--- a/test/fileutils/test_verbose.rb
+++ b/test/fileutils/test_verbose.rb
@@ -7,18 +7,19 @@ class TestFileUtilsVerbose < Test::Unit::TestCase
 
   include FileUtils::Verbose
 
-  def test_visibility
-    FileUtils::METHODS.each do |m|
+  FileUtils::METHODS.each do |m|
+    define_method "test_singleton_visibility_#{m}" do
       assert_equal true, FileUtils::Verbose.respond_to?(m, true),
                    "FileUtils::Verbose.#{m} is not defined"
       assert_equal true, FileUtils::Verbose.respond_to?(m, false),
                    "FileUtils::Verbose.#{m} is not public"
     end
-    FileUtils::METHODS.each do |m|
+
+    define_method "test_visibility_#{m}" do
       assert_equal true, respond_to?(m, true),
-                   "FileUtils::Verbose.#{m} is not defined"
+                   "FileUtils::Verbose\##{m} is not defined"
       assert_equal true, FileUtils::Verbose.private_method_defined?(m),
-                   "FileUtils::Verbose.#{m} is not private"
+                   "FileUtils::Verbose\##{m} is not private"
     end
   end