diff --git a/BUILD b/BUILD
index c5336e8c70..aaf356d55a 100644
--- a/BUILD
+++ b/BUILD
@@ -37,7 +37,6 @@ load(
     "upb_proto_library_copts",
     "upb_proto_reflection_library",
 )
-load("@rules_fuzzing//fuzzing:cc_defs.bzl", "cc_fuzz_test")
 
 licenses(["notice"])
 
@@ -327,15 +326,6 @@ cc_test(
     ],
 )
 
-cc_fuzz_test(
-    name = "file_descriptor_parsenew_fuzzer",
-    srcs = ["upb/file_descriptor_parsenew_fuzzer.cc"],
-    deps = [
-        "//:descriptor_upb_proto",
-        "//:upb",
-    ],
-)
-
 upb_proto_library(
     name = "conformance_proto_upb",
     testonly = 1,
diff --git a/upb/fuzz/BUILD b/upb/fuzz/BUILD
new file mode 100644
index 0000000000..3dd5a35744
--- /dev/null
+++ b/upb/fuzz/BUILD
@@ -0,0 +1,11 @@
+
+load("@rules_fuzzing//fuzzing:cc_defs.bzl", "cc_fuzz_test")
+
+cc_fuzz_test(
+    name = "file_descriptor_parsenew_fuzzer",
+    srcs = ["file_descriptor_parsenew_fuzzer.cc"],
+    deps = [
+        "//:descriptor_upb_proto",
+        "//:upb",
+    ],
+)
diff --git a/upb/file_descriptor_parsenew_fuzzer.cc b/upb/fuzz/file_descriptor_parsenew_fuzzer.cc
similarity index 100%
rename from upb/file_descriptor_parsenew_fuzzer.cc
rename to upb/fuzz/file_descriptor_parsenew_fuzzer.cc