The order of groups returned by id has changed.

40 files changed, 80 insertions, 80 deletions

diff --git a/tests/grouptools/groupmems/12_groupmems_user_add_user/run_groupmems.exp b/tests/grouptools/groupmems/12_groupmems_user_add_user/run_groupmems.exp
index c5339a3e..40552a83 100755
--- a/tests/grouptools/groupmems/12_groupmems_user_add_user/run_groupmems.exp
+++ b/tests/grouptools/groupmems/12_groupmems_user_add_user/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/13_groupmems_user_del_user/run_groupmems.exp b/tests/grouptools/groupmems/13_groupmems_user_del_user/run_groupmems.exp
index abce2453..4a4053aa 100755
--- a/tests/grouptools/groupmems/13_groupmems_user_del_user/run_groupmems.exp
+++ b/tests/grouptools/groupmems/13_groupmems_user_del_user/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/run_groupmems.exp b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/run_groupmems.exp
index abce2453..4a4053aa 100755
--- a/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/run_groupmems.exp
+++ b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/run_groupmems.exp b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/run_groupmems.exp
index abce2453..4a4053aa 100755
--- a/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/run_groupmems.exp
+++ b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/run_groupmems.exp b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/run_groupmems.exp
index c5339a3e..40552a83 100755
--- a/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/run_groupmems.exp
+++ b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/run_groupmems.exp b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/run_groupmems.exp
index c5339a3e..40552a83 100755
--- a/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/run_groupmems.exp
+++ b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/run_groupmems.exp b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/run_groupmems.exp
index abce2453..4a4053aa 100755
--- a/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/run_groupmems.exp
+++ b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/run_groupmems.exp b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/run_groupmems.exp
index abce2453..4a4053aa 100755
--- a/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/run_groupmems.exp
+++ b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/20_groupmems_user_purge_user/run_groupmems.exp b/tests/grouptools/groupmems/20_groupmems_user_purge_user/run_groupmems.exp
index 6b159062..0bd4b824 100755
--- a/tests/grouptools/groupmems/20_groupmems_user_purge_user/run_groupmems.exp
+++ b/tests/grouptools/groupmems/20_groupmems_user_purge_user/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/run_groupmems.exp b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/run_groupmems.exp
index 6b159062..0bd4b824 100755
--- a/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/run_groupmems.exp
+++ b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/run_groupmems.exp b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/run_groupmems.exp
index 6b159062..0bd4b824 100755
--- a/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/run_groupmems.exp
+++ b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/run_groupmems.exp b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/run_groupmems.exp
index 44799c44..fa6fa361 100755
--- a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/run_groupmems.exp b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/run_groupmems.exp
index a409748b..6ecad00a 100755
--- a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424243(gmyuser) groups=99(groupmems),424243(gmyuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424243(gmyuser) groups=424243(gmyuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424243(gmyuser) groups=99(groupmems),424243(gmyuser)"
+expect "uid=424242(myuser) gid=424243(gmyuser) groups=424243(gmyuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/run_groupmems.exp b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/run_groupmems.exp
index c20f6ca1..4187218e 100755
--- a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/run_groupmems.exp
+++ b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/run_groupmems.exp b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/run_groupmems.exp
index c20f6ca1..4187218e 100755
--- a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/run_groupmems.exp b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/run_groupmems.exp
index 67abf47e..259d82a6 100755
--- a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/run_groupmems.exp
+++ b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/run_groupmems.exp b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/run_groupmems.exp
index cc12a218..aea1ddc8 100755
--- a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/run_groupmems.exp
+++ b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/run_groupmems.exp b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/run_groupmems.exp
index c5339a3e..40552a83 100755
--- a/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/run_groupmems.exp b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/run_groupmems.exp
index c5339a3e..40552a83 100755
--- a/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/run_groupmems.exp
+++ b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/run_groupmems.exp b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/run_groupmems.exp
index bcd728cf..a1bd34b3 100755
--- a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/run_groupmems.exp
+++ b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/run_groupmems.exp b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/run_groupmems.exp
index c6ec615d..1b3dd1cc 100755
--- a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/run_groupmems.exp
+++ b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/run_groupmems.exp b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/run_groupmems.exp
index 9641f94a..d37095b4 100755
--- a/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/run_groupmems.exp
+++ b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/run_groupmems.exp b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/run_groupmems.exp
index abce2453..4a4053aa 100755
--- a/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/run_groupmems.exp b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/run_groupmems.exp
index abce2453..4a4053aa 100755
--- a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/run_groupmems.exp
+++ b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/run_groupmems.exp b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/run_groupmems.exp
index 6b159062..0bd4b824 100755
--- a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/run_groupmems.exp b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/run_groupmems.exp
index 6b159062..0bd4b824 100755
--- a/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/run_groupmems.exp b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/run_groupmems.exp
index 6b159062..0bd4b824 100755
--- a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/run_groupmems.exp
+++ b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/run_groupmems.exp b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/run_groupmems.exp
index ade99580..c471c2c7 100755
--- a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/run_groupmems.exp b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/run_groupmems.exp
index dbaeb467..5e263a30 100755
--- a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/42_groupmems_user_list_users/run_groupmems.exp b/tests/grouptools/groupmems/42_groupmems_user_list_users/run_groupmems.exp
index 234085da..2b9b2174 100755
--- a/tests/grouptools/groupmems/42_groupmems_user_list_users/run_groupmems.exp
+++ b/tests/grouptools/groupmems/42_groupmems_user_list_users/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/run_groupmems.exp b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/run_groupmems.exp
index 234085da..2b9b2174 100755
--- a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/run_groupmems.exp
+++ b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/run_groupmems.exp b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/run_groupmems.exp
index 694924f2..8bba8bac 100755
--- a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/run_groupmems.exp
+++ b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/run_groupmems.exp b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/run_groupmems.exp
index 234085da..2b9b2174 100755
--- a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/run_groupmems.exp
+++ b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/run_groupmems.exp b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/run_groupmems.exp
index 234085da..2b9b2174 100755
--- a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/run_groupmems.exp
+++ b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/run_groupmems.exp b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/run_groupmems.exp
index 9a242836..0b10b00f 100755
--- a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/run_groupmems.exp
+++ b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/run_groupmems.exp b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/run_groupmems.exp
index 63c88ca1..123c573e 100755
--- a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/run_groupmems.exp
+++ b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/run_groupmems.exp b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/run_groupmems.exp
index 74e5b507..267548c3 100755
--- a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/run_groupmems.exp
+++ b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/run_groupmems.exp b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/run_groupmems.exp
index 47bbf596..b32825a5 100755
--- a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/run_groupmems.exp
+++ b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/run_groupmems.exp b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/run_groupmems.exp
index 9f9f799b..b7b7bb5b 100755
--- a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/run_groupmems.exp
+++ b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt
 
diff --git a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/run_groupmems.exp b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/run_groupmems.exp
index a20bce3e..56bb1879 100755
--- a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/run_groupmems.exp
+++ b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/run_groupmems.exp
@@ -17,11 +17,11 @@ spawn /bin/su myuser
 expect "$ "			;# Wait for the prompt
 
 send_user "\n# make sure we are now 'myuser'"
-send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)'"
+send_user "\n# id should return 'uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)'"
 send "\r"			;# restore the prompt for the logs
 send "id\r"			;# Verify we are really testsuite
 
-expect "uid=424242(myuser) gid=424242(myuser) groups=99(groupmems),424242(myuser)"
+expect "uid=424242(myuser) gid=424242(myuser) groups=424242(myuser),99(groupmems)"
 
 expect "$ "			;# Wait for the prompt