diff --git a/src/libsystemd-network/fuzz-dhcp-server-relay-message.c b/src/libsystemd-network/fuzz-dhcp-server-relay.c
similarity index 100%
rename from src/libsystemd-network/fuzz-dhcp-server-relay-message.c
rename to src/libsystemd-network/fuzz-dhcp-server-relay.c
diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index 0aa96b68385..ff59ec0f37e 100644
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -119,7 +119,7 @@ fuzzers += [
          [libsystemd_network,
           libshared]],
 
-        [files('fuzz-dhcp-server-relay-message.c'),
+        [files('fuzz-dhcp-server-relay.c'),
          [libsystemd_network,
           libshared]],
 
diff --git a/src/test/meson.build b/src/test/meson.build
index 1de502db8bf..297a65d9afc 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -613,7 +613,7 @@ tests += [
                'nss-test-util.h'),
          [],
          [libdl],
-         [], 'ENABLE_NSS'],
+         [], 'ENABLE_NSS', 'timeout=120'],
 
         [files('test-nss-users.c',
                'nss-test-util.c',
diff --git a/test/fuzz/fuzz-catalog/clusterfuzz-testcase-minimized-fuzz-catalog-5674475278827520 b/test/fuzz/fuzz-catalog/language-too-short
similarity index 100%
rename from test/fuzz/fuzz-catalog/clusterfuzz-testcase-minimized-fuzz-catalog-5674475278827520
rename to test/fuzz/fuzz-catalog/language-too-short
diff --git a/test/fuzz/fuzz-dhcp-client/minimized-from-555a2b073b8d208655b68c294f8dfd592a11e50a b/test/fuzz/fuzz-dhcp-client/parse-memleak
similarity index 100%
rename from test/fuzz/fuzz-dhcp-client/minimized-from-555a2b073b8d208655b68c294f8dfd592a11e50a
rename to test/fuzz/fuzz-dhcp-client/parse-memleak
diff --git a/test/fuzz/fuzz-dhcp-server-relay-message/7d924e16295cd14e12a01a5631ea94a3d11d1b52 b/test/fuzz/fuzz-dhcp-server-relay/7d924e16295cd14e12a01a5631ea94a3d11d1b52
similarity index 100%
rename from test/fuzz/fuzz-dhcp-server-relay-message/7d924e16295cd14e12a01a5631ea94a3d11d1b52
rename to test/fuzz/fuzz-dhcp-server-relay/7d924e16295cd14e12a01a5631ea94a3d11d1b52
diff --git a/test/fuzz/fuzz-dhcp-server-relay-message/fe4344e65d495388540dc1bf8eae70c46f8b867c b/test/fuzz/fuzz-dhcp-server-relay/fe4344e65d495388540dc1bf8eae70c46f8b867c
similarity index 100%
rename from test/fuzz/fuzz-dhcp-server-relay-message/fe4344e65d495388540dc1bf8eae70c46f8b867c
rename to test/fuzz/fuzz-dhcp-server-relay/fe4344e65d495388540dc1bf8eae70c46f8b867c
diff --git a/test/fuzz/fuzz-dhcp-server-relay-message/clusterfuzz-testcase-minimized-fuzz-dhcp-server-relay-message-4972399731277824 b/test/fuzz/fuzz-dhcp-server-relay/too-large-packet
similarity index 100%
rename from test/fuzz/fuzz-dhcp-server-relay-message/clusterfuzz-testcase-minimized-fuzz-dhcp-server-relay-message-4972399731277824
rename to test/fuzz/fuzz-dhcp-server-relay/too-large-packet
diff --git a/test/fuzz/fuzz-dhcp-server/clusterfuzz-testcase-minimized-fuzz-dhcp-server-4916534286352384 b/test/fuzz/fuzz-dhcp-server/duplicate-input-data
similarity index 100%
rename from test/fuzz/fuzz-dhcp-server/clusterfuzz-testcase-minimized-fuzz-dhcp-server-4916534286352384
rename to test/fuzz/fuzz-dhcp-server/duplicate-input-data