2 files changed, 12 insertions, 1 deletions
diff --git a/spec/ruby/shared/string/end_with.rb b/spec/ruby/shared/string/end_with.rb
index 5f2a011235..0e4c1386e8 100644
--- a/spec/ruby/shared/string/end_with.rb
+++ b/spec/ruby/shared/string/end_with.rb
@@ -38,7 +38,7 @@ describe :end_with, shared: true do
   it "uses only the needed arguments" do
     find = mock('h')
     find.should_not_receive(:to_str)
-    "hello".send(@method).should.end_with?("o",find)
+    "hello".send(@method).should.end_with?("o", find)
   end
 
   it "works for multibyte strings" do
@@ -51,4 +51,11 @@ describe :end_with, shared: true do
       "あれ".send(@method).end_with?(pat)
     end.should raise_error(Encoding::CompatibilityError)
   end
+
+  it "checks that we are starting to match at the head of a character" do
+    "\xC3\xA9".send(@method).should_not.end_with?("\xA9")
+    "\xe3\x81\x82".send(@method).should_not.end_with?("\x82")
+    "ab".force_encoding("UTF-16BE").send(@method).should_not.end_with?(
+        "b".force_encoding("UTF-16BE"))
+  end
 end
diff --git a/spec/ruby/shared/string/start_with.rb b/spec/ruby/shared/string/start_with.rb
index d8d6e13f6a..6932a017b6 100644
--- a/spec/ruby/shared/string/start_with.rb
+++ b/spec/ruby/shared/string/start_with.rb
@@ -69,4 +69,8 @@ describe :start_with, shared: true do
     Regexp.last_match.should be_nil
     $1.should be_nil
   end
+
+  it "does not check that we are not matching part of a character" do
+    "\xC3\xA9".send(@method).should.start_with?("\xC3")
+  end
 end