diff --git a/testsuite/expect/README b/testsuite/expect/README
index e22cb4b6851b7f25663178eb1dfb4dec8d3e1713..e9be2c771f457440e63a7a66fb43ea551240a881 100644
--- a/testsuite/expect/README
+++ b/testsuite/expect/README
@@ -671,7 +671,7 @@ test21.32  Validate that mod qos =,+=,-= change the preempt value
 test21.33  Validate that a resource can be added to a cluster after creation
 test21.34  Validate that partition and job qos limits are enforced
 test21.35  Validate DenyOnLimit QoS flag is enforced on QoS and Associations.
-test21.36  Validate that sacctmgr lost jobs fixes lost jobs.
+test21.36  Validate that sacctmgr runaway jobs fixes runaway jobs.
 
 
 test22.#   Testing of sreport commands and options.
diff --git a/testsuite/expect/test21.36 b/testsuite/expect/test21.36
index 434755269e52fad184b212dfdfb3ad209e931a86..c0ebf72231844be6e709172bc264b67610b16aa0 100755
--- a/testsuite/expect/test21.36
+++ b/testsuite/expect/test21.36
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Validates that sacctmgr lost jobs returns lost jobs
+#          Validates that sacctmgr runaway jobs returns runaway jobs
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -201,13 +201,13 @@ if {[archive_load $sql_query]} {
 	endit
 }
 
-# Test sacctmgr show lost jobs
+# Test sacctmgr show runaway jobs
 set list_job 0
 # Use temp conf file to use different cluster name.
 set env(SLURM_CONF) $test_conf_file
-spawn $sacctmgr show -i lost jobs
+spawn $sacctmgr show -i runaway jobs
 expect {
-	-re "NOTE: Lost jobs" {
+	-re "NOTE: Runaway jobs" {
 		set list_job 1
 		exp_continue
 	}
@@ -221,16 +221,16 @@ expect {
 }
 
 if {$list_job != 1} {
-	send_user "\nFAILURE: sacctmgr did not find any lost jobs when "
+	send_user "\nFAILURE: sacctmgr did not find any runaway jobs when "
 	send_user "it should have\n"
 	endit
 }
 
 # Check that jobs were fixed
 set list_job 0
-spawn $sacctmgr show -i lost jobs
+spawn $sacctmgr show -i runaway jobs
 expect {
-	-re "No lost jobs found" {
+	-re "No runaway jobs found" {
 		set list_job 1
 		exp_continue
 	}
@@ -244,7 +244,7 @@ expect {
 }
 
 if {$list_job != 1} {
-	send_user "\nFAILURE: sacctmgr found lost jobs when "
+	send_user "\nFAILURE: sacctmgr found runaway jobs when "
 	send_user "it should not have\n"
 	endit
 }