diff --git a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err
index 5d61c15f..32dc7909 100644
--- a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err
+++ b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err
@@ -1 +1 @@
-gpasswd: can't get lock
+gpasswd: cannot lock /etc/group; try again later.
diff --git a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err
index 1f14d32b..a44907e0 100644
--- a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err
+++ b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err
@@ -1 +1 @@
-gpasswd: can't get shadow lock
+gpasswd: cannot lock /etc/gshadow; try again later.
diff --git a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gpasswd.err b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gpasswd.err
index 93816b89..b2bf7b08 100644
--- a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gpasswd.err
+++ b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gpasswd.err
@@ -1,2 +1,2 @@
-unknown group: usersss
+gpasswd: group 'usersss' does not exist in /etc/group
 gpasswd: Permission denied.
diff --git a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gpasswd.err b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gpasswd.err
index 2cf11e76..1ae3559c 100644
--- a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gpasswd.err
+++ b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gpasswd.err
@@ -1 +1 @@
-gpasswd: unknown user foooo
+gpasswd: user 'foooo' does not exist
diff --git a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gpasswd.err b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gpasswd.err
index 2cf11e76..1ae3559c 100644
--- a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gpasswd.err
+++ b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gpasswd.err
@@ -1 +1 @@
-gpasswd: unknown user foooo
+gpasswd: user 'foooo' does not exist
diff --git a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gpasswd.err b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gpasswd.err
index 087112f1..e6582d49 100644
--- a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gpasswd.err
+++ b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gpasswd.err
@@ -1 +1 @@
-gpasswd: unknown member foo
+gpasswd: user 'foo' is not a member of 'users'
diff --git a/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err b/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err
index e9a2c08b..cd895dcd 100644
--- a/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err
+++ b/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err
@@ -1 +1 @@
-groupadd: unable to lock group file
+groupadd: cannot lock /etc/group; try again later.
diff --git a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err
index f72d21ac..bfaeae55 100644
--- a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err
+++ b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err
@@ -1 +1 @@
-groupadd: unable to lock shadow group file
+groupadd: cannot lock /etc/gshadow; try again later.
diff --git a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/groupadd.err b/tests/grouptools/groupadd/13_groupadd_invalid_name/data/groupadd.err
index 856a6eb4..e7ca762c 100644
--- a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/groupadd.err
+++ b/tests/grouptools/groupadd/13_groupadd_invalid_name/data/groupadd.err
@@ -1 +1 @@
-groupadd: foo:bar is not a valid group name
+groupadd: 'foo:bar' is not a valid group name
diff --git a/tests/grouptools/groupadd/16_groupadd_existing_group/data/groupadd.err b/tests/grouptools/groupadd/16_groupadd_existing_group/data/groupadd.err
index 8013f888..be5ec5f4 100644
--- a/tests/grouptools/groupadd/16_groupadd_existing_group/data/groupadd.err
+++ b/tests/grouptools/groupadd/16_groupadd_existing_group/data/groupadd.err
@@ -1 +1 @@
-groupadd: group foo exists
+groupadd: group 'foo' already exists
diff --git a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/groupadd.err b/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/groupadd.err
index 21145285..0d9ff9ee 100644
--- a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/groupadd.err
+++ b/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/groupadd.err
@@ -1,2 +1,2 @@
-Can't get unique GID (no more available GIDs)
+groupadd: Can't get unique GID (no more available GIDs)
 groupadd: can't create group
diff --git a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/groupadd.err b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/groupadd.err
index 21145285..0d9ff9ee 100644
--- a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/groupadd.err
+++ b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/groupadd.err
@@ -1,2 +1,2 @@
-Can't get unique GID (no more available GIDs)
+groupadd: Can't get unique GID (no more available GIDs)
 groupadd: can't create group
diff --git a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/groupadd.err b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/groupadd.err
index ae12ef6b..2ab5ee7e 100644
--- a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/groupadd.err
+++ b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/groupadd.err
@@ -1 +1 @@
-groupadd: GID 1000 is not unique
+groupadd: GID '1000' already exists
diff --git a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/groupdel.err b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/groupdel.err
index af0e1e9c..f33297a6 100644
--- a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/groupdel.err
+++ b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/groupdel.err
@@ -1 +1 @@
-groupdel: cannot remove user's primary group.
+groupdel: cannot remove the primary group of user 'bar'
diff --git a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/groupdel.err b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/groupdel.err
index 3633d761..21d6add0 100644
--- a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/groupdel.err
+++ b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/groupdel.err
@@ -1 +1 @@
-groupdel: group foo does not exist
+groupdel: group 'foo' does not exist
diff --git a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err
index d7d4b23f..a2be4919 100644
--- a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err
+++ b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err
@@ -1 +1 @@
-groupdel: unable to lock group file
+groupdel: cannot lock /etc/group; try again later.
diff --git a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err
index 60cdb31b..80f021cb 100644
--- a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err
+++ b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err
@@ -1 +1 @@
-groupdel: unable to lock shadow group file
+groupdel: cannot lock /etc/gshadow; try again later.
diff --git a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/groupmod.err b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/groupmod.err
index a9b6cc58..35720f8f 100644
--- a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/groupmod.err
+++ b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/groupmod.err
@@ -1 +1 @@
-groupmod: group bar does not exist
+groupmod: group 'bar' does not exist
diff --git a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/groupmod.err b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/groupmod.err
index dc6942dc..796f6559 100644
--- a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/groupmod.err
+++ b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/groupmod.err
@@ -1 +1 @@
-groupmod: 1001 is not a unique GID
+groupmod: GID '1001' already exists
diff --git a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/groupmod.err b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/groupmod.err
index 911d4998..97ea6f6b 100644
--- a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/groupmod.err
+++ b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/groupmod.err
@@ -1 +1 @@
-groupmod: bar is not a unique name
+groupmod: group 'bar' already exists
diff --git a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/groupmod.err b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/groupmod.err
index 70c5bd0f..1a0e5377 100644
--- a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/groupmod.err
+++ b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/groupmod.err
@@ -1 +1 @@
-groupmod: to:to is not a valid group name
+groupmod: invalid group name 'to:to'
diff --git a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err
index ea0a050c..4355a923 100644
--- a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err
+++ b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err
@@ -1 +1 @@
-groupmod: unable to lock group file
+groupmod: cannot lock /etc/group; try again later.
diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/groupmod.err b/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/groupmod.err
index 0eba3283..5e7d27b8 100644
--- a/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/groupmod.err
+++ b/tests/grouptools/groupmod/18_groupmod_change_gid_error_locked_gshadow/data/groupmod.err
@@ -1 +1 @@
-groupmod: unable to lock shadow group file
+groupmod: cannot lock /etc/gshadow; try again later.