diff --git a/tests/chage/02/run b/tests/chage/02/run
index 8dd98db8..74ac2682 100755
--- a/tests/chage/02/run
+++ b/tests/chage/02/run
@@ -39,7 +39,10 @@ save
 # restore the files on exit
 trap 'if [ "$?" != "0" ]; then echo "FAIL"; fi; restore' 0
 
-cp data/{passwd,group,shadow,gshadow} /etc/
+for i in passwd group shadow gshadow
+do
+	cp data/$i /etc
+done
 
 echo "interractive test"
 ./run.exp $(date "+%Y-%m-%d")
diff --git a/tests/cktools/01/run1 b/tests/cktools/01/run1
index 5134b402..04aa793b 100755
--- a/tests/cktools/01/run1
+++ b/tests/cktools/01/run1
@@ -32,7 +32,10 @@ save
 # restore the files on exit
 trap 'restore' 0
 
-cp data/{passwd,shadow,group,gshadow} /etc/
+for i in passwd group shadow gshadow
+do
+	cp data/$i /etc
+done
 
 lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
 lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
diff --git a/tests/cktools/01/run2 b/tests/cktools/01/run2
index 28a5c18b..df1e2777 100755
--- a/tests/cktools/01/run2
+++ b/tests/cktools/01/run2
@@ -33,7 +33,10 @@ save
 # restore the files on exit
 trap 'restore' 0
 
-cp data/{passwd,shadow,group,gshadow} /etc/
+for i in passwd group shadow gshadow
+do
+	cp data/$i /etc
+done
 
 lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
 lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
diff --git a/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.exp b/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.exp
index c563f060..cfd779fb 100755
--- a/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.exp
+++ b/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.exp b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.exp
index 39ea35db..48adf7a1 100755
--- a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.exp
+++ b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.exp b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.exp
index 2d49285e..5229ab52 100755
--- a/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.exp
+++ b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.exp b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.exp
index 8c68da88..5181ebaf 100755
--- a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.exp
+++ b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.exp b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.exp
index 6e0dd7a3..3ac4abee 100755
--- a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.exp
+++ b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.exp b/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.exp
index a2a9a503..f8228c27 100755
--- a/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.exp
+++ b/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck tmp/group tmp/gshadow\r"
diff --git a/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.exp b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.exp
index 841ac58b..d111afc3 100755
--- a/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.exp
+++ b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck tmp/group tmp/gshadow\r"
diff --git a/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.exp b/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.exp
index 67fd58c7..1dd1d010 100755
--- a/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.exp
+++ b/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.exp b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.exp
index 9daa387d..b470a90f 100755
--- a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.exp
+++ b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.exp b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.exp
index 220f8239..ec5378b8 100755
--- a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.exp
+++ b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.exp b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.exp
index 446db1f9..c12fbd81 100755
--- a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.exp
+++ b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.exp b/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.exp
index 94410203..cce68028 100755
--- a/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.exp
+++ b/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.exp b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.exp
index 730c8d05..1b123f11 100755
--- a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.exp
+++ b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.exp b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.exp
index 8d00e8c5..7e544151 100755
--- a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.exp
+++ b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.exp b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.exp
index 734bb510..aa7f11f9 100755
--- a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.exp
+++ b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.exp b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.exp
index a02d7f41..ce6cb2e8 100755
--- a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.exp
+++ b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.exp b/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.exp
index 9fd1cfa9..cb758db2 100755
--- a/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.exp
+++ b/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.exp b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.exp
index 80ee113c..40f22df7 100755
--- a/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.exp
+++ b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.exp b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.exp
index 17f07221..5c10a627 100755
--- a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.exp
+++ b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.exp b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.exp
index 73cba944..d5e5ddf9 100755
--- a/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.exp
+++ b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.exp b/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.exp
index 3191ae0a..da5dee56 100755
--- a/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.exp
+++ b/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "grpck\r"
diff --git a/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.exp b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.exp
index add7516b..e9c675dc 100755
--- a/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.exp
+++ b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.exp b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.exp
index 955f319d..89341ffb 100755
--- a/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.exp
+++ b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.exp b/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.exp
index 31be8870..bd4003d5 100755
--- a/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.exp
+++ b/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.exp b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.exp
index 251dc4c3..5a9b856a 100755
--- a/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.exp
+++ b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.exp b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.exp
index 2b59a7ac..38a613d4 100755
--- a/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.exp
+++ b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.exp b/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.exp
index 130fa6ea..b4451026 100755
--- a/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.exp
+++ b/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.exp b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.exp
index 0cba2406..31af0895 100755
--- a/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.exp
+++ b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck tmp/passwd tmp/shadow\r"
diff --git a/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.exp b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.exp
index 5d876403..2b2a09d4 100755
--- a/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.exp
+++ b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck tmp/passwd tmp/shadow\r"
diff --git a/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.exp b/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.exp
index 9d2d1f13..fb8cba1e 100755
--- a/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.exp
+++ b/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.exp b/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.exp
index e5ae523a..9c460ce4 100755
--- a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.exp
+++ b/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.exp b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.exp
index e5fdc0bf..c7affdc9 100755
--- a/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.exp
+++ b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.exp b/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.exp
index 8e419122..61c6c6bd 100755
--- a/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.exp
+++ b/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.exp b/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.exp
index 76a406a6..dc9ef892 100755
--- a/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.exp
+++ b/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.exp b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.exp
index 79275da0..d6ec869e 100755
--- a/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.exp
+++ b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.exp b/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.exp
index 1da7eced..a75ef355 100755
--- a/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.exp
+++ b/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.exp b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.exp
index c30ed553..cde86e5c 100755
--- a/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.exp
+++ b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.exp b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.exp
index 173219df..315a72bb 100755
--- a/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.exp
+++ b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.exp b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.exp
index d55361ea..83575ac5 100755
--- a/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.exp
+++ b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "pwck\r"
diff --git a/tests/passwd/17_passwd_root_change_password/passwd.exp b/tests/passwd/17_passwd_root_change_password/passwd.exp
index 7a230a6b..2696ffbc 100755
--- a/tests/passwd/17_passwd_root_change_password/passwd.exp
+++ b/tests/passwd/17_passwd_root_change_password/passwd.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "passwd\r"
diff --git a/tests/passwd/18_passwd_root_change_password_user/passwd.exp b/tests/passwd/18_passwd_root_change_password_user/passwd.exp
index b12d3ea6..5150c6ad 100755
--- a/tests/passwd/18_passwd_root_change_password_user/passwd.exp
+++ b/tests/passwd/18_passwd_root_change_password_user/passwd.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 
 send "passwd foo\r"
diff --git a/tests/passwd/19_passwd_user_change_password/passwd.exp b/tests/passwd/19_passwd_user_change_password/passwd.exp
index 4e303389..6a3f1b61 100755
--- a/tests/passwd/19_passwd_user_change_password/passwd.exp
+++ b/tests/passwd/19_passwd_user_change_password/passwd.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 send "su -l foo\r"
 expect "$ "
diff --git a/tests/passwd/20_passwd_user_change_password_same_user/passwd.exp b/tests/passwd/20_passwd_user_change_password_same_user/passwd.exp
index 6533c9a7..70d4b809 100755
--- a/tests/passwd/20_passwd_user_change_password_same_user/passwd.exp
+++ b/tests/passwd/20_passwd_user_change_password_same_user/passwd.exp
@@ -4,6 +4,7 @@ set timeout 2
 expect_after default {puts "\nFAIL"; exit 1}
 
 spawn /bin/sh
+send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r"
 expect "# "
 send "su -l foo\r"
 expect "$ "