diff --git a/core/file/dirname_spec.rb b/core/file/dirname_spec.rb
index 63436e19c..1b006af78 100644
--- a/core/file/dirname_spec.rb
+++ b/core/file/dirname_spec.rb
@@ -78,6 +78,28 @@ def object.to_int; 2; end
     File.dirname("foo/../").should == "foo"
   end
 
+  it "rejects strings encoded with non ASCII-compatible encodings" do
+    Encoding.list.reject(&:ascii_compatible?).reject(&:dummy?).each do |enc|
+      path = "/foo/bar".encode(enc)
+      -> {
+        File.dirname(path)
+      }.should raise_error(Encoding::CompatibilityError)
+    end
+  end
+
+  it "works with all ASCII-compatible encodings" do
+    Encoding.list.select(&:ascii_compatible?).each do |enc|
+      File.dirname("/foo/bar".encode(enc)).should == "/foo".encode(enc)
+    end
+  end
+
+  it "handles Shift JIS 0x5C (\\) as second byte of a multi-byte sequence" do
+    # dir/fileソname.txt
+    path = "dir/file\x83\x5cname.txt".b.force_encoding(Encoding::SHIFT_JIS)
+    path.valid_encoding?.should be_true
+    File.dirname(path).should == "dir"
+  end
+
   platform_is_not :windows do
     it "ignores repeated leading / (edge cases on non-windows)" do
       File.dirname("/////foo/bar/").should == "/foo"
@@ -98,6 +120,13 @@ def object.to_int; 2; end
       File.dirname("//foo//").should == "//foo"
       File.dirname('/////').should == '//'
     end
+
+    it "handles Shift JIS 0x5C (\\) as second byte of a multi-byte sequence (windows)" do
+      # dir\fileソname.txt
+      path = "dir\\file\x83\x5cname.txt".b.force_encoding(Encoding::SHIFT_JIS)
+      path.valid_encoding?.should be_true
+      File.dirname(path).should == "dir"
+    end
   end
 
   it "accepts an object that has a #to_path method" do