diff --git a/BUILD b/BUILD
index b54e0bed39..c700832614 100644
--- a/BUILD
+++ b/BUILD
@@ -326,6 +326,7 @@ cc_test(
     ],
     deps = [
         ":test_json_upbprotoreflection",
+        ":test_json_upbproto",
         ":upb_json",
         ":upb_test",
     ],
diff --git a/tests/json/test.proto b/tests/json/test.proto
index e6590011da..2db0388d77 100644
--- a/tests/json/test.proto
+++ b/tests/json/test.proto
@@ -29,6 +29,11 @@ message TestMessage {
   map<string, int32>      map_string_int32 = 23;
   map<string, bool>       map_string_bool = 24;
   map<string, SubMessage> map_string_msg = 25;
+
+  oneof o {
+    int32 oneof_int32 = 26;
+    int64 oneof_int64 = 27;
+  }
 }
 
 message SubMessage {
diff --git a/tests/json/test.proto.pb b/tests/json/test.proto.pb
index 5da355d600..94b8b92e61 100644
Binary files a/tests/json/test.proto.pb and b/tests/json/test.proto.pb differ
diff --git a/tests/json/test_json.cc b/tests/json/test_json.cc
index 3fddfb6174..66508179b3 100644
--- a/tests/json/test_json.cc
+++ b/tests/json/test_json.cc
@@ -4,6 +4,7 @@
  */
 
 #include "tests/json/test.upbdefs.h"
+#include "tests/json/test.upb.h"   // Test that it compiles for C++.
 #include "tests/test_util.h"
 #include "tests/upb_test.h"
 #include "upb/handlers.h"
diff --git a/upbc/generator.cc b/upbc/generator.cc
index 27600693da..5843597527 100644
--- a/upbc/generator.cc
+++ b/upbc/generator.cc
@@ -362,7 +362,7 @@ void GenerateMessageInHeader(const protobuf::Descriptor* message, Output& output
         fullname);
     output(
         "UPB_INLINE $0_oneofcases $1_$2_case(const $1* msg) { "
-        "return UPB_FIELD_AT(msg, int, $3); }\n"
+        "return ($0_oneofcases)UPB_FIELD_AT(msg, int32_t, $3); }\n"
         "\n",
         fullname, msgname, oneof->name(),
         GetSizeInit(layout.GetOneofCaseOffset(oneof)));