diff --git a/testsuite/expect/test12.3 b/testsuite/expect/test12.3
index 4cd98f56398ef6eadd0a9a50f4b5b4a27448a639..6cf7de93dc7633e01ed6dbddd3f904bd2befd388 100755
--- a/testsuite/expect/test12.3
+++ b/testsuite/expect/test12.3
@@ -74,7 +74,7 @@ if { [test_account_storage] == 0 } {
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
 	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\n"
-	send_user "Use sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "Use: sacctmgr mod user \$USER set admin=admin.\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test12.4 b/testsuite/expect/test12.4
index 2365cb7c87390c9b37f3a9db415b466a92ba0c93..52e67ad1cfe699366c1f7a48b49a9aa98d630185 100755
--- a/testsuite/expect/test12.4
+++ b/testsuite/expect/test12.4
@@ -48,7 +48,7 @@ if { [test_account_storage] == 0 } {
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
 	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\n"
-	send_user "Use sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "Use: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test2.16 b/testsuite/expect/test2.16
index 6d66af668c00d1876db9141da29d6fe71e5ee5f0..2c1b7507b48a5631fb269bf7ba53af7fb9234614 100755
--- a/testsuite/expect/test2.16
+++ b/testsuite/expect/test2.16
@@ -46,7 +46,7 @@ if { [test_account_storage] == 0 } {
 	exit 0
 }
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test2.17 b/testsuite/expect/test2.17
index 628ea8c6db41e6553b6906192395da44fc534b4c..16ef1da062f3794193ba9ec7a2517199940dd398 100755
--- a/testsuite/expect/test2.17
+++ b/testsuite/expect/test2.17
@@ -46,7 +46,7 @@ if { [test_account_storage] == 0 } {
 	exit 0
 }
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test2.18 b/testsuite/expect/test2.18
index 7d15dacacd738e3d903ae936aba1be97f220af47..fcedb3ccb3c966c9f68fb5c555262f1109c1a4b6 100755
--- a/testsuite/expect/test2.18
+++ b/testsuite/expect/test2.18
@@ -50,7 +50,7 @@ if { [test_account_storage] == 0 } {
 	exit 0
 }
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test2.19 b/testsuite/expect/test2.19
index 0869d0d7a220f9fde26c6430d4bcd5b8976336a7..a0014fc8e4e28bb4301a2b675141f8d8bbd6a2cb 100755
--- a/testsuite/expect/test2.19
+++ b/testsuite/expect/test2.19
@@ -54,7 +54,7 @@ if { [test_account_storage] == 0 } {
 }
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
 	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\n"
-	send_user "Use sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "Use: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.10 b/testsuite/expect/test21.10
index 9c5a6daca4f77227e0cd04736877863d6a7a9a48..526ceba9fd78c76c51854e2e4cf26a996ca4c093 100755
--- a/testsuite/expect/test21.10
+++ b/testsuite/expect/test21.10
@@ -79,7 +79,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.11 b/testsuite/expect/test21.11
index 7460c4c03d3cd76bb0755d2b7e36f625d7d5770f..2b360aed638e5fb1d871757ac9b462c4cbe1befa 100755
--- a/testsuite/expect/test21.11
+++ b/testsuite/expect/test21.11
@@ -87,7 +87,7 @@ if { [test_account_storage] == 0 } {
 # Verify if Administrator privileges
 #
  if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.12 b/testsuite/expect/test21.12
index e1810cdd23ef0c5ceaf113a0a12d9c46708b1dfd..abe720004a70f2fbdfcf9eb26910e9e13fc7551d 100755
--- a/testsuite/expect/test21.12
+++ b/testsuite/expect/test21.12
@@ -78,7 +78,7 @@ if { [test_account_storage] == 0 } {
 # Verify if Administrator privileges
 #
  if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.13 b/testsuite/expect/test21.13
index a78e54bd156bd8ae200f0e497c8cc278c1132e86..ddb0089f1086520e1a7763ccf5b751b52b9a54e6 100755
--- a/testsuite/expect/test21.13
+++ b/testsuite/expect/test21.13
@@ -94,7 +94,7 @@ if { [test_account_storage] == 0 } {
 # Verify if Administrator privileges
 #
  if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.14 b/testsuite/expect/test21.14
index 42a24fa4098869fc5de69ddca689d70e3b5a5742..dd5dda3a87931a6c6de6e8f159083c87c8a52d8e 100755
--- a/testsuite/expect/test21.14
+++ b/testsuite/expect/test21.14
@@ -115,7 +115,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.15 b/testsuite/expect/test21.15
index 2f18b014d69aebafc3b7d1b7242c4f38a2e3dea6..8d17c5de9eceea0d4c4a912fa0d6b2be1fed69db 100755
--- a/testsuite/expect/test21.15
+++ b/testsuite/expect/test21.15
@@ -104,7 +104,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.16 b/testsuite/expect/test21.16
index 325faff9affda812fc311c382eaf3a6bd0a1cc31..627c90d4a5532d87d58a9a35a7b0fc09516d89a9 100755
--- a/testsuite/expect/test21.16
+++ b/testsuite/expect/test21.16
@@ -102,7 +102,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.17 b/testsuite/expect/test21.17
index dce23faf3e63c124187f21c047e2893a680cc088..abd980c8c9c325573bd825251fb1dd132d8ae5a8 100755
--- a/testsuite/expect/test21.17
+++ b/testsuite/expect/test21.17
@@ -94,7 +94,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.18 b/testsuite/expect/test21.18
index 5d4d347b9d6b7872b9487a62ec8cfe93c192adb5..c4dbd57214ccf36d26ae854e2b76bbf8e5d71030 100755
--- a/testsuite/expect/test21.18
+++ b/testsuite/expect/test21.18
@@ -114,7 +114,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.19 b/testsuite/expect/test21.19
index 3cc892aa9d5f30f5fd99dd45eb6ec1d5e3c53c02..f57f7ac9f417fc143cbe9294376fe2fe3ebc3c4f 100755
--- a/testsuite/expect/test21.19
+++ b/testsuite/expect/test21.19
@@ -112,7 +112,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.20 b/testsuite/expect/test21.20
index 150b62bba023f0f8b10200228cab37ed4400020d..46d8c9b9834542fb3003f1611e8dc6c37027e18e 100755
--- a/testsuite/expect/test21.20
+++ b/testsuite/expect/test21.20
@@ -102,7 +102,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.21 b/testsuite/expect/test21.21
index 5508c3342e82b7b6413b180f56ce733742280fcd..1bd4e4c8dfdced8d7ceff40942325dff29492b6a 100755
--- a/testsuite/expect/test21.21
+++ b/testsuite/expect/test21.21
@@ -253,7 +253,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.22 b/testsuite/expect/test21.22
index 6f0093dc02939d7ab22cc47f2a0577578d8eb585..0f01c0b37294900dc1af261470c20feb68cf5088 100755
--- a/testsuite/expect/test21.22
+++ b/testsuite/expect/test21.22
@@ -207,7 +207,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.23 b/testsuite/expect/test21.23
index 9cd175d56bf28b03865f26f27b52e0966b5d5211..bf64856a34be35ae0852445f3ef7ac0c339b183b 100755
--- a/testsuite/expect/test21.23
+++ b/testsuite/expect/test21.23
@@ -54,7 +54,7 @@ if { [test_track_wckey] == 0} {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.24 b/testsuite/expect/test21.24
index e2906f5c078a4aefdd5b1dc8080ac69dff185404..49978ffb4e20d75821910386b0f8adb4873e13d8 100755
--- a/testsuite/expect/test21.24
+++ b/testsuite/expect/test21.24
@@ -258,7 +258,7 @@ if { [test_account_storage] == 0 } {
 set track_wckey [test_track_wckey]
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.26 b/testsuite/expect/test21.26
index 3ac268ede77d66c59acab7a813a766436c35f52f..d5d1dbf416f665107cbea1d076520d86c73d4c9b 100755
--- a/testsuite/expect/test21.26
+++ b/testsuite/expect/test21.26
@@ -89,7 +89,7 @@ if { [test_account_storage] == 0 } {
 # Make sure we have permission to do this work
 #
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.27 b/testsuite/expect/test21.27
index 874f9150c234b46ae28d8710df9f537db101cebd..2466130525ba143efdcaf8be7a5494e54c756d49 100755
--- a/testsuite/expect/test21.27
+++ b/testsuite/expect/test21.27
@@ -57,7 +57,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.28 b/testsuite/expect/test21.28
index 6ce5a8caf12d31e57d4bcb1739e4d6d1f4aab375..34f685d9f67b426e6a9fa4bc27f3eeb049ae594b 100755
--- a/testsuite/expect/test21.28
+++ b/testsuite/expect/test21.28
@@ -86,7 +86,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.29 b/testsuite/expect/test21.29
index 4d5fe32539aa9f06cf5869ccc3f0edb791df4359..34bfb92a2ed4e3d8b43a987f8e84b099a9a6f69d 100755
--- a/testsuite/expect/test21.29
+++ b/testsuite/expect/test21.29
@@ -74,7 +74,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.31 b/testsuite/expect/test21.31
index 139c9a9e6228b46ec2d82a9265c54ea6fe1b91a6..9e3ad7e11e8967489e4e7c5c5714cb8b56780ef1 100755
--- a/testsuite/expect/test21.31
+++ b/testsuite/expect/test21.31
@@ -107,7 +107,7 @@ if {[test_super_user] == 0} {
 }
 
 #if { [string compare [check_accounting_admin_level] "Administrator"] } {
-#	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+#	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 #	exit 0
 #}
 
diff --git a/testsuite/expect/test21.5 b/testsuite/expect/test21.5
index dc6b3af272f2763984bddbc05e71717e33f8f589..262120da0798a3141e05e5d71eaa924c991daf38 100755
--- a/testsuite/expect/test21.5
+++ b/testsuite/expect/test21.5
@@ -66,7 +66,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.6 b/testsuite/expect/test21.6
index ee91d0d3f467bbf582f04826186fd01836e5a7fa..4546698e4b7bcec5a026458e82d80146955d7f57 100755
--- a/testsuite/expect/test21.6
+++ b/testsuite/expect/test21.6
@@ -71,7 +71,7 @@ if { [test_account_storage] == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.7 b/testsuite/expect/test21.7
index e2de23464f156e6eca5123d36526c8f90f392cf1..c44b4bfe099eb390fb54b25b895e516e69b6b0d6 100755
--- a/testsuite/expect/test21.7
+++ b/testsuite/expect/test21.7
@@ -67,7 +67,7 @@ if { [test_account_storage] == 0 } {
 # Verify if Administrator privileges
 #
  if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.8 b/testsuite/expect/test21.8
index f1b15b0435c141a2cd9978ac0cf24f14e8666f50..85dcd3d245847b3e36ce7c52fd513a8bad8986d9 100755
--- a/testsuite/expect/test21.8
+++ b/testsuite/expect/test21.8
@@ -83,7 +83,7 @@ if { [test_account_storage] == 0 } {
 # Verify if Administrator privileges
 #
  if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test21.9 b/testsuite/expect/test21.9
index 98d56968c12562b7cc9208a10fea6dded98e5871..56dbbf3fae3e42ae14d07cebcfd2ac62d45cca50 100755
--- a/testsuite/expect/test21.9
+++ b/testsuite/expect/test21.9
@@ -87,7 +87,7 @@ if { [test_account_storage] == 0 } {
 # Verify if Administrator privileges
 #
  if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index 652500daa39a9e19cec1089f4119d87e12f6831c..76192af4c8bc60e4bf751ac30147e4abe171dd0d 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -184,7 +184,7 @@ if { $wc_key_track == 0 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test23.2 b/testsuite/expect/test23.2
index 11813f8a1fe991aa00e447f9df024612b3948b6b..a8c9f8469cb7bdb2aa778e3f8a764d3cf3be2809 100755
--- a/testsuite/expect/test23.2
+++ b/testsuite/expect/test23.2
@@ -75,7 +75,7 @@ if { [test_front_end] == 1 } {
 }
 
 if { [string compare [check_accounting_admin_level] "Administrator"] } {
-	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse sacctmgr mod user \$USER_NAME set admin=admin.\n"
+	send_user "\nWARNING: This test can't be run without being an Accounting administrator.\nUse: sacctmgr mod user \$USER set admin=admin.\n"
 	exit 0
 }