diff --git a/ruby/tests/basic.rb b/ruby/tests/basic.rb
index d1a66a6169..321b63fa6c 100755
--- a/ruby/tests/basic.rb
+++ b/ruby/tests/basic.rb
@@ -128,6 +128,7 @@ module BasicTest
       m.a = "foo"
       assert_equal "foo", m.a
       assert m.has_my_oneof?
+      assert_equal :a, m.my_oneof
       m.clear_a
       assert !m.has_my_oneof?
 
diff --git a/ruby/tests/basic_proto2.rb b/ruby/tests/basic_proto2.rb
index 986a31b229..2d30a08944 100755
--- a/ruby/tests/basic_proto2.rb
+++ b/ruby/tests/basic_proto2.rb
@@ -73,10 +73,11 @@ module BasicTestProto2
       m = OneofMessage.new
       assert !m.has_my_oneof?
       m.a = "foo"
+      assert m.has_my_oneof?
+      assert_equal :a, m.my_oneof
       assert m.has_a?
       assert OneofMessage.descriptor.lookup('a').has?(m)
       assert_equal "foo", m.a
-      assert m.has_my_oneof?
       assert !m.has_b?
       assert !OneofMessage.descriptor.lookup('b').has?(m)
       assert !m.has_c?