diff --git a/fuzztest/fuzztest_macros.h b/fuzztest/fuzztest_macros.h
index d0ad352..9ac8cb9 100644
--- a/fuzztest/fuzztest_macros.h
+++ b/fuzztest/fuzztest_macros.h
@@ -65,7 +65,8 @@
 //
 // Note: When specifying both the domains and seeds, the domain clause has to
 // be specified first.
-#define FUZZ_TEST(suite_name, func) INTERNAL_FUZZ_TEST(suite_name, func)
+#define FUZZ_TEST(suite_name, func) \
+  INTERNAL_FUZZ_TEST(suite_name, __LINE__, func)
 
 // The FUZZ_TEST_F macro registers a fuzz test that uses a test fixture.
 //
diff --git a/fuzztest/internal/registry.h b/fuzztest/internal/registry.h
index 0e8a446..c959000 100644
--- a/fuzztest/internal/registry.h
+++ b/fuzztest/internal/registry.h
@@ -101,13 +101,17 @@
   }
 };
 
-#define INTERNAL_FUZZ_TEST(suite_name, func)                      \
+#define INTERNAL_FUZZ_TEST_IMPL(suite_name, test_name, func)      \
   [[maybe_unused]] static ::fuzztest::internal::RegistrationToken \
-      fuzztest_reg___##suite_name##___##func =                    \
+      fuzztest_reg___##suite_name##___##test_name =               \
           ::fuzztest::internal::RegistrationToken{} =             \
               ::fuzztest::GetRegistration<decltype(+func)>(       \
                   #suite_name, #func, __FILE__, __LINE__, +func)
 
+#define INTERNAL_FUZZ_TEST(suite_name, test_name, func) \
+  /* Expand any macros (like line numbers) */           \
+  INTERNAL_FUZZ_TEST_IMPL(suite_name, test_name, func)
+
 #define INTERNAL_FUZZ_TEST_F(suite_name, test_name, fixture, func) \
   [[maybe_unused]] static ::fuzztest::internal::RegistrationToken  \
       fuzztest_reg___##suite_name##___##test_name =                \