diff --git a/testsuite/expect/test21.10 b/testsuite/expect/test21.10
index 352bdcdab30faa382a25a3c3526594ee4e98293f..b5b7e52be0d00fe2910a282f078b505d24b2113f 100755
--- a/testsuite/expect/test21.10
+++ b/testsuite/expect/test21.10
@@ -7,7 +7,7 @@
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
 ############################################################################
-# Copyright (C) 2008 Lawrence Livermore National Security.
+# Copyright (C) 2008-2010 Lawrence Livermore National Security.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 # Written by Joseph Donaghy <donaghy1@llnl.gov>
 # CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
 source ./globals
 
 set test_id     "21.10"
+set test_nu     "test21-10"
 set exit_code   0
 set acmatches   0
 set aamatches   0
@@ -61,7 +62,7 @@ set ms		MaxSubmitJobs
 set mn		MaxNodes
 set mw		MaxWall
 set clu		cluster
-set tc1		tcluster1
+set tc1		[format "%s%s" $test_nu "clus1"]
 set fs1		2500
 set gm1		1000
 set gc1		20
@@ -77,7 +78,7 @@ set mn1		200
 set mw1		01:00:00
 set acc		account
 set ass		associations
-set nm1		testaccta1
+set nm1		[format "%s%s" $test_nu "acct1"]
 set des		Description
 set ds1		"Test Account A1"
 set org		Organization
diff --git a/testsuite/expect/test21.11 b/testsuite/expect/test21.11
index 4a4de9e7f30985a88fa4240ff585bdaf5c1c81aa..f1191ff0f3f9f42e180cd1cbae8db8fe19f3a44e 100755
--- a/testsuite/expect/test21.11
+++ b/testsuite/expect/test21.11
@@ -7,7 +7,7 @@
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
 ############################################################################
-# Copyright (C) 2008 Lawrence Livermore National Security.
+# Copyright (C) 2008-2010 Lawrence Livermore National Security.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 # Written by Joseph Donaghy <donaghy1@llnl.gov>
 # CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
 source ./globals
 
 set test_id     "21.11"
+set test_nu     "test21-11"
 set exit_code   0
 set acmatches   0
 set aamatches   0
@@ -53,8 +54,8 @@ set mj		MaxJobs
 set mn		MaxNodes
 set mw		MaxWall
 set clu		cluster
-set tc1		tcluster1
-set tc2		tcluster2
+set tc1		[format "%s%s" $test_nu "clus1"]
+set tc2		[format "%s%s" $test_nu "clus2"]
 set fs1		2500
 set mc1		1000000
 set mj1		50
@@ -62,8 +63,8 @@ set mn1		300
 set mw1		01:00:00
 set acc		account
 set ass		associations
-set nm1		testaccta1
-set nm2		testaccta2
+set nm1		[format "%s%s" $test_nu "acct1"]
+set nm2		[format "%s%s" $test_nu "acct2"]
 set des		Description
 set ds1		"Test Account A1"
 set org		Organization
@@ -152,22 +153,22 @@ if {$aamatches != 1} {
 #
 # Use sacctmgr to list the test associations
 #
-set as_list_pid [spawn $sacctmgr list $ass $clu=$tc1,$tc2]
+set as_list_pid [spawn $sacctmgr -p list $ass $clu=$tc1,$tc2]
 expect {
-	-re "$tc1 *$nm1" {
+	-re "$tc1.$nm1" {
 		incr almatches
 		exp_continue
 	}
-	-re "$tc1 *$nm2" {
+	-re "$tc1.$nm2" {
 		incr almatches
 		exp_continue
 	}
-	-re "$tc2 *$nm1" {
+	-re "$tc2.$nm1" {
 		set exit_code 1
 		send_user "\nFAILURE: $nm1 account erroneously added to $tc2\n"
 		exp_continue
 	}
-	-re "$tc2 *$nm2" {
+	-re "$tc2.$nm2" {
 		exp_continue
 		send_user "\nFAILURE: $nm2 account erroneously added to $tc2\n"
 		set exit_code 1
diff --git a/testsuite/expect/test21.5 b/testsuite/expect/test21.5
index 86f5378d002afd259db5ae73cacea71b270c0581..33c0ca062b02b0aa090539c3324e1c48e65f3faa 100755
--- a/testsuite/expect/test21.5
+++ b/testsuite/expect/test21.5
@@ -7,7 +7,7 @@
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
 ############################################################################
-# Copyright (C) 2008 Lawrence Livermore National Security.
+# Copyright (C) 2008-2010 Lawrence Livermore National Security.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 # Written by Joseph Donaghy <donaghy1@llnl.gov>
 # CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
 source ./globals
 
 set test_id     "21.5"
+set test_nu     "test21-5"
 set exit_code   0
 set amatches    0
 set lmatches    0
@@ -56,7 +57,8 @@ set ms		MaxSubmitJobs
 set mn		MaxNodes
 set mw		MaxWall
 set clu		cluster
-set tc1		tcluster1
+set tc1		[format "%s%s" $test_nu "clus"]
+#set tc1		tcluster1
 set fs1		2500
 set gc1		50
 set gj1		100
diff --git a/testsuite/expect/test21.6 b/testsuite/expect/test21.6
index e63d1842dbb5b766889f60a0e3053eb9cf9c0322..a755eb9ec7e5fcf9dab3011c27d10f1510604415 100755
--- a/testsuite/expect/test21.6
+++ b/testsuite/expect/test21.6
@@ -7,7 +7,7 @@
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
 ############################################################################
-# Copyright (C) 2008 Lawrence Livermore National Security.
+# Copyright (C) 2008-2010 Lawrence Livermore National Security.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 # Written by Joseph Donaghy <donaghy1@llnl.gov>
 # CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
 source ./globals
 
 set test_id     "21.6"
+set test_nu     "test21-6"
 set exit_code   0
 set amatches    0
 set lmatches    0
@@ -56,9 +57,9 @@ set ms		MaxSubmitJobs
 set mn		MaxNodes
 set mw		MaxWall
 set clu		cluster
-set tc1		tcluster1
-set tc2		tcluster2
-set tc3		tcluster3
+set tc1		[format "%s%s" $test_nu "clus1"]
+set tc2		[format "%s%s" $test_nu "clus2"]
+set tc3		[format "%s%s" $test_nu "clus3"]
 set fs1		2500
 set gc1		50
 set gj1		100
diff --git a/testsuite/expect/test21.7 b/testsuite/expect/test21.7
index 955fdd2604111f4fb85f9250c65b648dfc6e5b5a..a7edbbd9bc5466125a4e5d12ff07f097b582dea4 100755
--- a/testsuite/expect/test21.7
+++ b/testsuite/expect/test21.7
@@ -7,7 +7,7 @@
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
 ############################################################################
-# Copyright (C) 2008 Lawrence Livermore National Security.
+# Copyright (C) 2008-2010 Lawrence Livermore National Security.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 # Written by Joseph Donaghy <donaghy1@llnl.gov>
 # CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
 source ./globals
 
 set test_id     "21.7"
+set test_nu     "test21-7"
 set exit_code   0
 set amatches    0
 set lmatches    0
@@ -56,9 +57,9 @@ set ms		MaxSubmitJobs
 set mn		MaxNodes
 set mw		MaxWall
 set clu		cluster
-set tc1		tcluster1
-set tc2		tcluster2
-set tc3		tcluster3
+set tc1		[format "%s%s" $test_nu "clus1"]
+set tc2		[format "%s%s" $test_nu "clus2"]
+set tc3		[format "%s%s" $test_nu "clus3"]
 set fs1		2500
 set gc1		50
 set gj1		100
diff --git a/testsuite/expect/test21.8 b/testsuite/expect/test21.8
index 8a0aa1c0d77543761cd09eb9facbea60980926b3..ab8fa89dbe20f1fe631456f46d6cde269e051baf 100755
--- a/testsuite/expect/test21.8
+++ b/testsuite/expect/test21.8
@@ -7,7 +7,7 @@
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
 ############################################################################
-# Copyright (C) 2008 Lawrence Livermore National Security.
+# Copyright (C) 2008-2010 Lawrence Livermore National Security.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 # Written by Joseph Donaghy <donaghy1@llnl.gov>
 # CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
 source ./globals
 
 set test_id     "21.8"
+set test_nu     "test21-8"
 set exit_code   0
 set amatches    0
 set mmatches    0
@@ -57,9 +58,9 @@ set ms		MaxSubmitJobs
 set mn		MaxNodes
 set mw		MaxWall
 set clu		cluster
-set tc1		tcluster1
-set tc2		tcluster2
-set tc3		tcluster3
+set tc1		[format "%s%s" $test_nu "clus1"]
+set tc2		[format "%s%s" $test_nu "clus2"]
+set tc3		[format "%s%s" $test_nu "clus3"]
 set fs1		2500
 set fs2		1375
 set gc1		20
diff --git a/testsuite/expect/test21.9 b/testsuite/expect/test21.9
index 0eab41c1e3b388ccf21d209d8db6936e6770d370..b117712a2dc6b11542f772abb9a76706f1dec62b 100755
--- a/testsuite/expect/test21.9
+++ b/testsuite/expect/test21.9
@@ -7,7 +7,7 @@
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
 ############################################################################
-# Copyright (C) 2008 Lawrence Livermore National Security.
+# Copyright (C) 2008-2010 Lawrence Livermore National Security.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 # Written by Joseph Donaghy <donaghy1@llnl.gov>
 # CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
 source ./globals
 
 set test_id     "21.9"
+set test_nu     "test21-9"
 set exit_code   0
 set amatches    0
 set mmatches    0
@@ -57,9 +58,9 @@ set ms		MaxSubmitJobs
 set mn		MaxNodes
 set mw		MaxWall
 set clu		cluster
-set tc1		tcluster1
-set tc2		tcluster2
-set tc3		tcluster3
+set tc1		[format "%s%s" $test_nu "clus1"]
+set tc2		[format "%s%s" $test_nu "clus2"]
+set tc3		[format "%s%s" $test_nu "clus3"]
 set fs1		2500
 set fs2		1375
 set gc1		20
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index fc479a8d5390e91af451e13e37e71d2bfc981d90..900c5d676ebd5915150e4c5dce419bdd66f8e131 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -33,7 +33,7 @@
 source ./globals_accounting
 
 set test_id     "test22.1"
-set test_nu     "test22n1"
+set test_nu     "test22-1"
 set exit_code   0
 set matches     0
 set not_support 0