diff --git a/test/units/TEST-17-UDEV.05.sh b/test/units/TEST-17-UDEV.IMPORT.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.05.sh
rename to test/units/TEST-17-UDEV.IMPORT.sh
diff --git a/test/units/TEST-17-UDEV.08.sh b/test/units/TEST-17-UDEV.SYSTEMD_ALIAS.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.08.sh
rename to test/units/TEST-17-UDEV.SYSTEMD_ALIAS.sh
diff --git a/test/units/TEST-17-UDEV.01.sh b/test/units/TEST-17-UDEV.SYSTEMD_WANTS.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.01.sh
rename to test/units/TEST-17-UDEV.SYSTEMD_WANTS.sh
diff --git a/test/units/TEST-17-UDEV.07.sh b/test/units/TEST-17-UDEV.SYSTEMD_WANTS_vs_StopWhenUnneeded.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.07.sh
rename to test/units/TEST-17-UDEV.SYSTEMD_WANTS_vs_StopWhenUnneeded.sh
diff --git a/test/units/TEST-17-UDEV.04.sh b/test/units/TEST-17-UDEV.TAG.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.04.sh
rename to test/units/TEST-17-UDEV.TAG.sh
diff --git a/test/units/TEST-17-UDEV.09.sh b/test/units/TEST-17-UDEV.buffer-size.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.09.sh
rename to test/units/TEST-17-UDEV.buffer-size.sh
diff --git a/test/units/TEST-17-UDEV.03.sh b/test/units/TEST-17-UDEV.failed-event.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.03.sh
rename to test/units/TEST-17-UDEV.failed-event.sh
diff --git a/test/units/TEST-17-UDEV.13.sh b/test/units/TEST-17-UDEV.global-property.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.13.sh
rename to test/units/TEST-17-UDEV.global-property.sh
diff --git a/test/units/TEST-17-UDEV.12.sh b/test/units/TEST-17-UDEV.netif-altname.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.12.sh
rename to test/units/TEST-17-UDEV.netif-altname.sh
diff --git a/test/units/TEST-17-UDEV.00.sh b/test/units/TEST-17-UDEV.owner-and-mode.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.00.sh
rename to test/units/TEST-17-UDEV.owner-and-mode.sh
diff --git a/test/units/TEST-17-UDEV.02.sh b/test/units/TEST-17-UDEV.rename-netif.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.02.sh
rename to test/units/TEST-17-UDEV.rename-netif.sh
diff --git a/test/units/TEST-17-UDEV.10.sh b/test/units/TEST-17-UDEV.sanity-check.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.10.sh
rename to test/units/TEST-17-UDEV.sanity-check.sh
diff --git a/test/units/TEST-17-UDEV.11.sh b/test/units/TEST-17-UDEV.verify.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.11.sh
rename to test/units/TEST-17-UDEV.verify.sh
diff --git a/test/units/TEST-17-UDEV.06.sh b/test/units/TEST-17-UDEV.watch.sh
similarity index 100%
rename from test/units/TEST-17-UDEV.06.sh
rename to test/units/TEST-17-UDEV.watch.sh