2 files changed, 10 insertions, 1 deletions
diff --git a/test/lib/leakchecker.rb b/test/lib/leakchecker.rb
index 599141d609..b6ed19e9c4 100644
--- a/test/lib/leakchecker.rb
+++ b/test/lib/leakchecker.rb
@@ -15,7 +15,6 @@ class LeakChecker
   def find_fds
     fd_dir = "/proc/self/fd"
     if File.directory?(fd_dir)
-      require "-test-/dir"
       fds = Dir.open(fd_dir) {|d|
         a = d.grep(/\A\d+\z/, &:to_i)
         if d.respond_to? :fileno
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index 4ce3944cfc..ee1210cc37 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -294,4 +294,14 @@ class TestDir < Test::Unit::TestCase
       end
     end
   end
+
+  def test_fileno
+    Dir.open(".") {|d|
+      if d.respond_to? :fileno
+        assert_kind_of(Integer, d.fileno)
+      else
+        assert_raise(NotImplementedError) { d.fileno }
+      end
+    }
+  end
 end