diff --git a/testsuite/expect/test1.7 b/testsuite/expect/test1.7
index 3623ccede74c971934fd831453490764f6c80332..af2550823c064401e20e270d4e9b5764692abde1 100755
--- a/testsuite/expect/test1.7
+++ b/testsuite/expect/test1.7
@@ -10,7 +10,7 @@
 # Note:    This script generates and then deletes files in the working directory 
 #          named test1.7.input, test1.7.output, and test1.7.error
 ############################################################################
-# Copyright (C) 2002-6 The Regents of the University of California.
+# Copyright (C) 2002-2006 The Regents of the University of California.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 # Written by Morris Jette <jette1@llnl.gov>
 # UCRL-CODE-217948.
@@ -49,6 +49,7 @@ print_header $test_id
 #
 # Make sure sleep time is no larger than InactiveLimit
 set inactive_limit  $sleep_time
+set kill_wait       $sleep_time
 log_user 0
 spawn $scontrol show config
 expect {
@@ -56,6 +57,10 @@ expect {
 		set inactive_limit $expect_out(1,string)
 		exp_continue
 	}
+	-re "KillWait.*= ($number)" {
+		set kill_wait $expect_out(1,string)
+		exp_continue
+	}
 	timeout {
 		send_user "\nFAILURE: scontrol not responding\n"
 		set exit_code 1
@@ -72,6 +77,10 @@ if {$inactive_limit < 120} {
 	send_user "\nWARNING: Inactive limit is too low for this test\n"
 	exit 0
 }
+if {$kill_wait > 60} {
+	send_user "\nWARNING: KillWait configured too high for this test\n"
+	exit 0
+}
 if {$inactive_limit < $sleep_time} {
 	set sleep_time $inactive_limit
 	send_user "\nReset job sleep time to $sleep_time seconds\n"