diff --git a/tests/run_all b/tests/run_all
index ab8ef9a3..d36f747c 100755
--- a/tests/run_all
+++ b/tests/run_all
@@ -618,7 +618,7 @@ run_test ./usertools/12_usermod_move_homedir_dev_null/usermod.test
 run_test ./usertools/13_usermod_move_homedir_file/usermod.test
 run_test ./usertools/14_usermod_move_homedir_other_device/usermod.test
 run_test ./usertools/15_usermod_change_supplementary_groups/usermod.test
-run_test ./usertools/16_usermod_remove_supplementary_groups/usermod.test
+run_test ./usertools/16_usermod_clear_supplementary_groups/usermod.test
 run_test ./usertools/17_usermod_change_supplementary_groups_numerical/usermod.test
 run_test ./usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test
 run_test ./usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test
diff --git a/tests/run_all.coverage b/tests/run_all.coverage
index ba49d5e9..610194e8 100755
--- a/tests/run_all.coverage
+++ b/tests/run_all.coverage
@@ -634,7 +634,7 @@ run_test ./usertools/12_usermod_move_homedir_dev_null/usermod.test
 run_test ./usertools/13_usermod_move_homedir_file/usermod.test
 run_test ./usertools/14_usermod_move_homedir_other_device/usermod.test
 run_test ./usertools/15_usermod_change_supplementary_groups/usermod.test
-run_test ./usertools/16_usermod_remove_supplementary_groups/usermod.test
+run_test ./usertools/16_usermod_clear_supplementary_groups/usermod.test
 run_test ./usertools/17_usermod_change_supplementary_groups_numerical/usermod.test
 run_test ./usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test
 run_test ./usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test
diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/config.txt b/tests/usertools/16_usermod_clear_supplementary_groups/config.txt
similarity index 100%
rename from tests/usertools/16_usermod_remove_supplementary_groups/config.txt
rename to tests/usertools/16_usermod_clear_supplementary_groups/config.txt
diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/config/etc/default/useradd b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/default/useradd
similarity index 100%
rename from tests/usertools/16_usermod_remove_supplementary_groups/config/etc/default/useradd
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/default/useradd
diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/config/etc/group b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/group
similarity index 100%
rename from tests/usertools/16_usermod_remove_supplementary_groups/config/etc/group
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/group
diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/config/etc/gshadow b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/gshadow
similarity index 100%
rename from tests/usertools/16_usermod_remove_supplementary_groups/config/etc/gshadow
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/gshadow
diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/config/etc/passwd b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/passwd
similarity index 100%
rename from tests/usertools/16_usermod_remove_supplementary_groups/config/etc/passwd
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/passwd
diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/config/etc/shadow b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/shadow
similarity index 100%
rename from tests/usertools/16_usermod_remove_supplementary_groups/config/etc/shadow
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/shadow
diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/data/group b/tests/usertools/16_usermod_clear_supplementary_groups/data/group
similarity index 100%
rename from tests/usertools/16_usermod_remove_supplementary_groups/data/group
rename to tests/usertools/16_usermod_clear_supplementary_groups/data/group
diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/data/gshadow b/tests/usertools/16_usermod_clear_supplementary_groups/data/gshadow
similarity index 100%
rename from tests/usertools/16_usermod_remove_supplementary_groups/data/gshadow
rename to tests/usertools/16_usermod_clear_supplementary_groups/data/gshadow
diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/usermod.test b/tests/usertools/16_usermod_clear_supplementary_groups/usermod.test
similarity index 100%
rename from tests/usertools/16_usermod_remove_supplementary_groups/usermod.test
rename to tests/usertools/16_usermod_clear_supplementary_groups/usermod.test