diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel
index a1c448c1f56ca..3fcbeddb7d2c5 100644
--- a/src/google/protobuf/BUILD.bazel
+++ b/src/google/protobuf/BUILD.bazel
@@ -1466,6 +1466,22 @@ cc_library(
     ],
 )
 
+cc_test(
+    name = "extension_declaration_test",
+    srcs = ["extension_declaration_test.cc"],
+    data = [
+        "testdata/extdecl/dup_number/extdecl_field_options.txtpb",
+        "testdata/extdecl/extdecl_field_options.txtpb",
+        "testdata/extdecl/invalid/extdecl_field_options.txtpb",
+    ],
+    deps = [
+        ":protobuf",
+        "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/strings",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
 cc_test(
     name = "drop_unknown_fields_test",
     srcs = ["drop_unknown_fields_test.cc"],
diff --git a/src/google/protobuf/testdata/extdecl_field_options.textpb b/src/google/protobuf/testdata/extdecl/extdecl_field_options.txtpb
similarity index 100%
rename from src/google/protobuf/testdata/extdecl_field_options.textpb
rename to src/google/protobuf/testdata/extdecl/extdecl_field_options.txtpb
diff --git a/src/google/protobuf/testdata/invalid_extdecl/extdecl_field_options.textpb b/src/google/protobuf/testdata/invalid_extdecl/extdecl_field_options.textpb
deleted file mode 100644
index c9ed7ef179741..0000000000000
--- a/src/google/protobuf/testdata/invalid_extdecl/extdecl_field_options.textpb
+++ /dev/null
@@ -1,11 +0,0 @@
-# For Protobuf extension declaration test only.
-# DO NOT add extension declaration to this file.
-#
-# proto-file: path/to/my_file.proto
-# proto-message: MyMessage
-
-no_declaration {
-  number: 525000000
-  full_name: ".protoc.extension.declaration.test"
-  type: "string"
-}