diff --git a/test/fuzz/fuzz-manager-serialize/activation-details-path b/test/fuzz/fuzz-manager-serialize/activation-details similarity index 100% rename from test/fuzz/fuzz-manager-serialize/activation-details-path rename to test/fuzz/fuzz-manager-serialize/activation-details diff --git a/test/fuzz/fuzz-manager-serialize/activation-details-service b/test/fuzz/fuzz-manager-serialize/bogus-unit-type similarity index 100% rename from test/fuzz/fuzz-manager-serialize/activation-details-service rename to test/fuzz/fuzz-manager-serialize/bogus-unit-type diff --git a/test/fuzz/fuzz-netdev-parser/25-6rd-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/6rd-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-6rd-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/6rd-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/28-batadv.netdev b/test/fuzz/fuzz-netdev-parser/batadv.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/28-batadv.netdev rename to test/fuzz/fuzz-netdev-parser/batadv.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-bond-backup.netdev b/test/fuzz/fuzz-netdev-parser/bond-backup.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-bond-backup.netdev rename to test/fuzz/fuzz-netdev-parser/bond-backup.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-bond.netdev b/test/fuzz/fuzz-netdev-parser/bond.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-bond.netdev rename to test/fuzz/fuzz-netdev-parser/bond.netdev diff --git a/test/fuzz/fuzz-netdev-parser/26-bridge.netdev b/test/fuzz/fuzz-netdev-parser/bridge-2.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/26-bridge.netdev rename to test/fuzz/fuzz-netdev-parser/bridge-2.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-bridge.netdev b/test/fuzz/fuzz-netdev-parser/bridge.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-bridge.netdev rename to test/fuzz/fuzz-netdev-parser/bridge.netdev diff --git a/test/fuzz/fuzz-netdev-parser/12-dummy.netdev b/test/fuzz/fuzz-netdev-parser/dummy-2.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/12-dummy.netdev rename to test/fuzz/fuzz-netdev-parser/dummy-2.netdev diff --git a/test/fuzz/fuzz-netdev-parser/11-dummy.netdev b/test/fuzz/fuzz-netdev-parser/dummy.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/11-dummy.netdev rename to test/fuzz/fuzz-netdev-parser/dummy.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-erspan-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/erspan-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-erspan-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/erspan-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-geneve.netdev b/test/fuzz/fuzz-netdev-parser/geneve.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-geneve.netdev rename to test/fuzz/fuzz-netdev-parser/geneve.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-gre-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/gre-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-gre-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/gre-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-gretap-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/gretap-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-gretap-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/gretap-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-ip6gre-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/ip6gre-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-ip6gre-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/ip6gre-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-ip6tnl-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/ip6tnl-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-ip6tnl-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/ip6tnl-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-ipip-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/ipip-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-ipip-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/ipip-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-ipip-tunnel2.netdev b/test/fuzz/fuzz-netdev-parser/ipip-tunnel2.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-ipip-tunnel2.netdev rename to test/fuzz/fuzz-netdev-parser/ipip-tunnel2.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-ipvlan.netdev b/test/fuzz/fuzz-netdev-parser/ipvlan.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-ipvlan.netdev rename to test/fuzz/fuzz-netdev-parser/ipvlan.netdev diff --git a/test/fuzz/fuzz-netdev-parser/21-macvlan.netdev b/test/fuzz/fuzz-netdev-parser/macvlan.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/21-macvlan.netdev rename to test/fuzz/fuzz-netdev-parser/macvlan.netdev diff --git a/test/fuzz/fuzz-netdev-parser/21-macvtap.netdev b/test/fuzz/fuzz-netdev-parser/macvtap.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/21-macvtap.netdev rename to test/fuzz/fuzz-netdev-parser/macvtap.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-sit-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/sit-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-sit-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/sit-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-tap.netdev b/test/fuzz/fuzz-netdev-parser/tap.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-tap.netdev rename to test/fuzz/fuzz-netdev-parser/tap.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-tun.netdev b/test/fuzz/fuzz-netdev-parser/tun.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-tun.netdev rename to test/fuzz/fuzz-netdev-parser/tun.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-vcan.netdev b/test/fuzz/fuzz-netdev-parser/vcan.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-vcan.netdev rename to test/fuzz/fuzz-netdev-parser/vcan.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-veth.netdev b/test/fuzz/fuzz-netdev-parser/veth.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-veth.netdev rename to test/fuzz/fuzz-netdev-parser/veth.netdev diff --git a/test/fuzz/fuzz-netdev-parser/21-vlan.netdev b/test/fuzz/fuzz-netdev-parser/vlan.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/21-vlan.netdev rename to test/fuzz/fuzz-netdev-parser/vlan.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-vrf.netdev b/test/fuzz/fuzz-netdev-parser/vrf.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-vrf.netdev rename to test/fuzz/fuzz-netdev-parser/vrf.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-vti-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/vti-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-vti-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/vti-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-vti6-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/vti6-tunnel.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-vti6-tunnel.netdev rename to test/fuzz/fuzz-netdev-parser/vti6-tunnel.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-vxlan.netdev b/test/fuzz/fuzz-netdev-parser/vxlan.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-vxlan.netdev rename to test/fuzz/fuzz-netdev-parser/vxlan.netdev diff --git a/test/fuzz/fuzz-netdev-parser/wireguard-duplicated-endpoint b/test/fuzz/fuzz-netdev-parser/wg-dup-endpoint similarity index 100% rename from test/fuzz/fuzz-netdev-parser/wireguard-duplicated-endpoint rename to test/fuzz/fuzz-netdev-parser/wg-dup-endpoint diff --git a/test/fuzz/fuzz-netdev-parser/25-wireguard.netdev b/test/fuzz/fuzz-netdev-parser/wireguard.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-wireguard.netdev rename to test/fuzz/fuzz-netdev-parser/wireguard.netdev diff --git a/test/fuzz/fuzz-netdev-parser/27-xfrm.netdev b/test/fuzz/fuzz-netdev-parser/xfrm.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/27-xfrm.netdev rename to test/fuzz/fuzz-netdev-parser/xfrm.netdev diff --git a/test/fuzz/fuzz-network-parser/23-active-slave b/test/fuzz/fuzz-network-parser/active-slave similarity index 100% rename from test/fuzz/fuzz-network-parser/23-active-slave rename to test/fuzz/fuzz-network-parser/active-slave diff --git a/test/fuzz/fuzz-network-parser/25-address-link-section b/test/fuzz/fuzz-network-parser/address-link-section similarity index 100% rename from test/fuzz/fuzz-network-parser/25-address-link-section rename to test/fuzz/fuzz-network-parser/address-link-section diff --git a/test/fuzz/fuzz-network-parser/25-address-section b/test/fuzz/fuzz-network-parser/address-section similarity index 100% rename from test/fuzz/fuzz-network-parser/25-address-section rename to test/fuzz/fuzz-network-parser/address-section diff --git a/test/fuzz/fuzz-network-parser/25-address-section-misc b/test/fuzz/fuzz-network-parser/address-section-misc similarity index 100% rename from test/fuzz/fuzz-network-parser/25-address-section-misc rename to test/fuzz/fuzz-network-parser/address-section-misc diff --git a/test/fuzz/fuzz-network-parser/23-bond199 b/test/fuzz/fuzz-network-parser/bond199 similarity index 100% rename from test/fuzz/fuzz-network-parser/23-bond199 rename to test/fuzz/fuzz-network-parser/bond199 diff --git a/test/fuzz/fuzz-network-parser/26-bridge-slave-interface-1 b/test/fuzz/fuzz-network-parser/bridge-slave-interface-1 similarity index 100% rename from test/fuzz/fuzz-network-parser/26-bridge-slave-interface-1 rename to test/fuzz/fuzz-network-parser/bridge-slave-interface-1 diff --git a/test/fuzz/fuzz-network-parser/26-bridge-slave-interface-2 b/test/fuzz/fuzz-network-parser/bridge-slave-interface-2 similarity index 100% rename from test/fuzz/fuzz-network-parser/26-bridge-slave-interface-2 rename to test/fuzz/fuzz-network-parser/bridge-slave-interface-2 diff --git a/test/fuzz/fuzz-network-parser/configure-without-carrier b/test/fuzz/fuzz-network-parser/configure-no-carrier similarity index 100% rename from test/fuzz/fuzz-network-parser/configure-without-carrier rename to test/fuzz/fuzz-network-parser/configure-no-carrier diff --git a/test/fuzz/fuzz-network-parser/dhcp-client-timezone-router b/test/fuzz/fuzz-network-parser/dhcp-client-tz-router similarity index 100% rename from test/fuzz/fuzz-network-parser/dhcp-client-timezone-router rename to test/fuzz/fuzz-network-parser/dhcp-client-tz-router diff --git a/test/fuzz/fuzz-network-parser/dhcp-server-timezone-router b/test/fuzz/fuzz-network-parser/dhcp-server-tz-router similarity index 100% rename from test/fuzz/fuzz-network-parser/dhcp-server-timezone-router rename to test/fuzz/fuzz-network-parser/dhcp-server-tz-router diff --git a/test/fuzz/fuzz-network-parser/dhcpv6-client-rapid-commit b/test/fuzz/fuzz-network-parser/dhcpv6-rapid-commit similarity index 100% rename from test/fuzz/fuzz-network-parser/dhcpv6-client-rapid-commit rename to test/fuzz/fuzz-network-parser/dhcpv6-rapid-commit diff --git a/test/fuzz/fuzz-network-parser/dns-trust-anchor-duplicate b/test/fuzz/fuzz-network-parser/dns-trust-dup-anchor similarity index 100% rename from test/fuzz/fuzz-network-parser/dns-trust-anchor-duplicate rename to test/fuzz/fuzz-network-parser/dns-trust-dup-anchor diff --git a/test/fuzz/fuzz-network-parser/23-emit-lldp b/test/fuzz/fuzz-network-parser/emit-lldp similarity index 100% rename from test/fuzz/fuzz-network-parser/23-emit-lldp rename to test/fuzz/fuzz-network-parser/emit-lldp diff --git a/test/fuzz/fuzz-network-parser/25-fibrule-port-range b/test/fuzz/fuzz-network-parser/fibrule-port-range similarity index 100% rename from test/fuzz/fuzz-network-parser/25-fibrule-port-range rename to test/fuzz/fuzz-network-parser/fibrule-port-range diff --git a/test/fuzz/fuzz-network-parser/ipv6-address-label-section b/test/fuzz/fuzz-network-parser/ipv6-address-label similarity index 100% rename from test/fuzz/fuzz-network-parser/ipv6-address-label-section rename to test/fuzz/fuzz-network-parser/ipv6-address-label diff --git a/test/fuzz/fuzz-network-parser/25-link-section-unmanaged b/test/fuzz/fuzz-network-parser/link-section-unmanaged similarity index 100% rename from test/fuzz/fuzz-network-parser/25-link-section-unmanaged rename to test/fuzz/fuzz-network-parser/link-section-unmanaged diff --git a/test/fuzz/fuzz-network-parser/24-lldp b/test/fuzz/fuzz-network-parser/lldp similarity index 100% rename from test/fuzz/fuzz-network-parser/24-lldp rename to test/fuzz/fuzz-network-parser/lldp diff --git a/test/fuzz/fuzz-network-parser/25-neighbor-section b/test/fuzz/fuzz-network-parser/neighbor-section similarity index 100% rename from test/fuzz/fuzz-network-parser/25-neighbor-section rename to test/fuzz/fuzz-network-parser/neighbor-section diff --git a/test/fuzz/fuzz-network-parser/23-primary-slave b/test/fuzz/fuzz-network-parser/primary-slave similarity index 100% rename from test/fuzz/fuzz-network-parser/23-primary-slave rename to test/fuzz/fuzz-network-parser/primary-slave diff --git a/test/fuzz/fuzz-network-parser/25-route-section b/test/fuzz/fuzz-network-parser/route-section similarity index 100% rename from test/fuzz/fuzz-network-parser/25-route-section rename to test/fuzz/fuzz-network-parser/route-section diff --git a/test/fuzz/fuzz-network-parser/25-route-type b/test/fuzz/fuzz-network-parser/route-type similarity index 100% rename from test/fuzz/fuzz-network-parser/25-route-type rename to test/fuzz/fuzz-network-parser/route-type diff --git a/test/fuzz/fuzz-network-parser/24-search-domain b/test/fuzz/fuzz-network-parser/search-domain similarity index 100% rename from test/fuzz/fuzz-network-parser/24-search-domain rename to test/fuzz/fuzz-network-parser/search-domain diff --git a/test/fuzz/fuzz-network-parser/25-sysctl b/test/fuzz/fuzz-network-parser/sysctl similarity index 100% rename from test/fuzz/fuzz-network-parser/25-sysctl rename to test/fuzz/fuzz-network-parser/sysctl diff --git a/test/fuzz/fuzz-network-parser/25-route-tcp-window-settings b/test/fuzz/fuzz-network-parser/tcp-window-settings similarity index 100% rename from test/fuzz/fuzz-network-parser/25-route-tcp-window-settings rename to test/fuzz/fuzz-network-parser/tcp-window-settings diff --git a/test/fuzz/fuzz-network-parser/23-test1-bond199 b/test/fuzz/fuzz-network-parser/test1-bond199 similarity index 100% rename from test/fuzz/fuzz-network-parser/23-test1-bond199 rename to test/fuzz/fuzz-network-parser/test1-bond199 diff --git a/test/fuzz/fuzz-network-parser/21-vlan b/test/fuzz/fuzz-network-parser/vlan similarity index 100% rename from test/fuzz/fuzz-network-parser/21-vlan rename to test/fuzz/fuzz-network-parser/vlan diff --git a/test/fuzz/fuzz-network-parser/27-xfrm b/test/fuzz/fuzz-network-parser/xfrm similarity index 100% rename from test/fuzz/fuzz-network-parser/27-xfrm rename to test/fuzz/fuzz-network-parser/xfrm diff --git a/test/fuzz/fuzz-resource-record/crash-type-bitmap-to-json b/test/fuzz/fuzz-resource-record/just-slash similarity index 100% rename from test/fuzz/fuzz-resource-record/crash-type-bitmap-to-json rename to test/fuzz/fuzz-resource-record/just-slash diff --git a/test/fuzz/fuzz-udev-rules/60-block.rules b/test/fuzz/fuzz-udev-rules/block.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-block.rules rename to test/fuzz/fuzz-udev-rules/block.rules diff --git a/test/fuzz/fuzz-udev-rules/64-btrfs.rules b/test/fuzz/fuzz-udev-rules/btrfs.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/64-btrfs.rules rename to test/fuzz/fuzz-udev-rules/btrfs.rules diff --git a/test/fuzz/fuzz-udev-rules/60-cdrom_id.rules b/test/fuzz/fuzz-udev-rules/cdrom_id.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-cdrom_id.rules rename to test/fuzz/fuzz-udev-rules/cdrom_id.rules diff --git a/test/fuzz/fuzz-udev-rules/80-drivers.rules b/test/fuzz/fuzz-udev-rules/drivers.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/80-drivers.rules rename to test/fuzz/fuzz-udev-rules/drivers.rules diff --git a/test/fuzz/fuzz-udev-rules/60-drm.rules b/test/fuzz/fuzz-udev-rules/drm.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-drm.rules rename to test/fuzz/fuzz-udev-rules/drm.rules diff --git a/test/fuzz/fuzz-udev-rules/60-evdev.rules b/test/fuzz/fuzz-udev-rules/evdev.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-evdev.rules rename to test/fuzz/fuzz-udev-rules/evdev.rules diff --git a/test/fuzz/fuzz-udev-rules/60-input-id.rules b/test/fuzz/fuzz-udev-rules/input-id.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-input-id.rules rename to test/fuzz/fuzz-udev-rules/input-id.rules diff --git a/test/fuzz/fuzz-udev-rules/70-joystick.rules b/test/fuzz/fuzz-udev-rules/joystick.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/70-joystick.rules rename to test/fuzz/fuzz-udev-rules/joystick.rules diff --git a/test/fuzz/fuzz-udev-rules/70-mouse.rules b/test/fuzz/fuzz-udev-rules/mouse.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/70-mouse.rules rename to test/fuzz/fuzz-udev-rules/mouse.rules diff --git a/test/fuzz/fuzz-udev-rules/75-net-description.rules b/test/fuzz/fuzz-udev-rules/net-description.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/75-net-description.rules rename to test/fuzz/fuzz-udev-rules/net-description.rules diff --git a/test/fuzz/fuzz-udev-rules/80-net-setup-link.rules b/test/fuzz/fuzz-udev-rules/net-setup-link.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/80-net-setup-link.rules rename to test/fuzz/fuzz-udev-rules/net-setup-link.rules diff --git a/test/fuzz/fuzz-udev-rules/60-persistent-alsa.rules b/test/fuzz/fuzz-udev-rules/persistent-alsa.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-persistent-alsa.rules rename to test/fuzz/fuzz-udev-rules/persistent-alsa.rules diff --git a/test/fuzz/fuzz-udev-rules/60-persistent-input.rules b/test/fuzz/fuzz-udev-rules/persistent-input.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-persistent-input.rules rename to test/fuzz/fuzz-udev-rules/persistent-input.rules diff --git a/test/fuzz/fuzz-udev-rules/60-persistent-storage.rules b/test/fuzz/fuzz-udev-rules/persistent-storage.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-persistent-storage.rules rename to test/fuzz/fuzz-udev-rules/persistent-storage.rules diff --git a/test/fuzz/fuzz-udev-rules/60-persistent-v4l.rules b/test/fuzz/fuzz-udev-rules/persistent-v4l.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-persistent-v4l.rules rename to test/fuzz/fuzz-udev-rules/persistent-v4l.rules diff --git a/test/fuzz/fuzz-udev-rules/75-probe_mtd.rules b/test/fuzz/fuzz-udev-rules/probe_mtd.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/75-probe_mtd.rules rename to test/fuzz/fuzz-udev-rules/probe_mtd.rules diff --git a/test/fuzz/fuzz-udev-rules/60-sensor.rules b/test/fuzz/fuzz-udev-rules/sensor.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-sensor.rules rename to test/fuzz/fuzz-udev-rules/sensor.rules diff --git a/test/fuzz/fuzz-udev-rules/60-serial.rules b/test/fuzz/fuzz-udev-rules/serial.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-serial.rules rename to test/fuzz/fuzz-udev-rules/serial.rules diff --git a/test/fuzz/fuzz-udev-rules/78-sound-card.rules b/test/fuzz/fuzz-udev-rules/sound-card.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/78-sound-card.rules rename to test/fuzz/fuzz-udev-rules/sound-card.rules diff --git a/test/fuzz/fuzz-udev-rules/60-persistent-storage-tape.rules b/test/fuzz/fuzz-udev-rules/storage-tape.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/60-persistent-storage-tape.rules rename to test/fuzz/fuzz-udev-rules/storage-tape.rules diff --git a/test/fuzz/fuzz-udev-rules/99-systemd.rules b/test/fuzz/fuzz-udev-rules/systemd.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/99-systemd.rules rename to test/fuzz/fuzz-udev-rules/systemd.rules diff --git a/test/fuzz/fuzz-udev-rules/70-touchpad.rules b/test/fuzz/fuzz-udev-rules/touchpad.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/70-touchpad.rules rename to test/fuzz/fuzz-udev-rules/touchpad.rules diff --git a/test/fuzz/fuzz-udev-rules/50-udev-default.rules b/test/fuzz/fuzz-udev-rules/udev-default.rules similarity index 100% rename from test/fuzz/fuzz-udev-rules/50-udev-default.rules rename to test/fuzz/fuzz-udev-rules/udev-default.rules diff --git a/test/fuzz/fuzz-unit-file/systemd-ask-password-console.path b/test/fuzz/fuzz-unit-file/ask-password-console.path similarity index 100% rename from test/fuzz/fuzz-unit-file/systemd-ask-password-console.path rename to test/fuzz/fuzz-unit-file/ask-password-console.path diff --git a/test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount b/test/fuzz/fuzz-unit-file/binfmt_misc.automount similarity index 100% rename from test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount rename to test/fuzz/fuzz-unit-file/binfmt_misc.automount diff --git a/test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer b/test/fuzz/fuzz-unit-file/tmpfiles-clean.timer similarity index 100% rename from test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer rename to test/fuzz/fuzz-unit-file/tmpfiles-clean.timer