diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config.txt b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config.txt
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config.txt
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config.txt
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/default/useradd b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/default/useradd
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/default/useradd
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/group b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/group
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/group
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/gshadow b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/gshadow
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/gshadow
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/login.defs b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/login.defs
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/passwd b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/passwd
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/passwd
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/shadow b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/config/etc/shadow
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/shadow
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/group b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/group
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/groupmod.err b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/groupmod.err
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/gshadow b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/gshadow
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/passwd b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/passwd
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/shadow b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/shadow
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/groupmod.test b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test
similarity index 100%
rename from tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/groupmod.test
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test