diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index bbf1743247..417ecf62b3 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -130,6 +130,7 @@ class OpenStruct
   def each_pair
     return to_enum(__method__) { @table.size } unless block_given?
     @table.each_pair{|p| yield p}
+    self
   end
 
   #
diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb
index aeccc9209a..7df5200ca1 100644
--- a/test/ostruct/test_ostruct.rb
+++ b/test/ostruct/test_ostruct.rb
@@ -141,6 +141,7 @@ class TC_OpenStruct < Test::Unit::TestCase
   def test_each_pair
     h = {name: "John Smith", age: 70, pension: 300}
     os = OpenStruct.new(h)
+    assert_same os, os.each_pair{ }
     assert_equal '#<Enumerator: #<OpenStruct name="John Smith", age=70, pension=300>:each_pair>', os.each_pair.inspect
     assert_equal [[:name, "John Smith"], [:age, 70], [:pension, 300]], os.each_pair.to_a
     assert_equal 3, os.each_pair.size