diff --git a/testsuite/expect/test2.16 b/testsuite/expect/test2.16
index 25003c7d09e1b594b7d1360eff817505a34dbbf6..aabcb1f76b8b292721e4c42b88151b5b91260656 100755
--- a/testsuite/expect/test2.16
+++ b/testsuite/expect/test2.16
@@ -31,9 +31,9 @@
 ############################################################################
 source ./globals
 
-set test_id        "test2.16"
-set part_name      "$test_id\_part"
-set acct_name      "$test_id\_acct"
+set test_id        "2.16"
+set part_name      "test$test_id\_part"
+set acct_name      "test$test_id\_acct"
 set exit_code      0
 
 print_header $test_id
diff --git a/testsuite/expect/test2.17 b/testsuite/expect/test2.17
index 87401e95eb505580a6774353752e022b55bf17dc..1ffd4f1e40c12c77a8cd038cff1d519295f44c4b 100755
--- a/testsuite/expect/test2.17
+++ b/testsuite/expect/test2.17
@@ -31,9 +31,9 @@
 ############################################################################
 source ./globals
 
-set test_id        "test2.17"
-set qos_name       "$test_id\_qos"
-set part_name      "$test_id\_part"
+set test_id        "2.17"
+set qos_name       "test$test_id\_qos"
+set part_name      "test$test_id\_part"
 set exit_code      0
 
 print_header $test_id
diff --git a/testsuite/expect/test2.18 b/testsuite/expect/test2.18
index 661bdc1add3f65c9edee5c230ea2acdf2ea1cbd2..fa529dfa1b9dcefc78b1f5aa2c2dfb8c5481e4de 100755
--- a/testsuite/expect/test2.18
+++ b/testsuite/expect/test2.18
@@ -31,13 +31,13 @@
 ############################################################################
 source ./globals
 
-set test_id        "test2.18"
+set test_id        "2.18"
 set user_name      ""
 set node_name      ""
 set host_name      ""
 set acct_g         "acct_good"
 set acct_b         "acct_bad"
-set part_name      "$test_id\_part"
+set part_name      "test$test_id\_part"
 set exit_code      0
 
 print_header $test_id
diff --git a/testsuite/expect/test2.19 b/testsuite/expect/test2.19
index eae0bb1c73c045221cf7fc920aabc3484a820f10..0e4a5c04c0eb62895264a990128771e9805c13eb 100755
--- a/testsuite/expect/test2.19
+++ b/testsuite/expect/test2.19
@@ -31,7 +31,7 @@
 ############################################################################
 source ./globals
 
-set test_id        "test2.19"
+set test_id        "2.19"
 set user_name      ""
 set node_name      ""
 set host_name      ""
@@ -39,7 +39,7 @@ set acct1          "acct_1"
 set acct2          "acct_2"
 set qos_g          "qos_good"
 set qos_b          "qos_bad"
-set part_name      "$test_id\_part"
+set part_name      "test$test_id\_part"
 set exit_code      0
 
 print_header $test_id