diff --git a/rust/test/cpp/BUILD b/rust/test/cpp/BUILD
index 18d68b9f3e..49d1de9b9c 100644
--- a/rust/test/cpp/BUILD
+++ b/rust/test/cpp/BUILD
@@ -21,13 +21,3 @@ rust_test(
     ],
     deps = ["//rust/test:unittest_cc_rust_proto"],
 )
-
-rust_test(
-    name = "nested_messages_test",
-    srcs = ["nested_messages_test.rs"],
-    tags = [
-        # TODO(b/270274576): Enable testing on arm once we have a Rust Arm toolchain.
-        "not_build:arm",
-    ],
-    deps = ["//rust/test:unittest_cc_rust_proto"],
-)
diff --git a/rust/test/shared/BUILD b/rust/test/shared/BUILD
index 606967c039..4740cc3afe 100644
--- a/rust/test/shared/BUILD
+++ b/rust/test/shared/BUILD
@@ -101,3 +101,23 @@ rust_test(
         "//rust/test:unittest_upb_rust_proto",
     ],
 )
+
+rust_test(
+    name = "nested_messages_cpp_test",
+    srcs = ["nested_messages_test.rs"],
+    tags = [
+        # TODO(b/270274576): Enable testing on arm once we have a Rust Arm toolchain.
+        "not_build:arm",
+    ],
+    deps = ["//rust/test:unittest_cc_rust_proto"],
+)
+
+rust_test(
+    name = "nested_messages_upb_test",
+    srcs = ["nested_messages_test.rs"],
+    tags = [
+        # TODO(b/270274576): Enable testing on arm once we have a Rust Arm toolchain.
+        "not_build:arm",
+    ],
+    deps = ["//rust/test:unittest_upb_rust_proto"],
+)
diff --git a/rust/test/cpp/nested_messages_test.rs b/rust/test/shared/nested_messages_test.rs
similarity index 100%
rename from rust/test/cpp/nested_messages_test.rs
rename to rust/test/shared/nested_messages_test.rs