diff --git a/testsuite/expect/test1.11 b/testsuite/expect/test1.11
index a97192b004d5667fa04dc5e7466cc6295d394903..bd2c5fa0dcc76982d3b5403306148387f313871e 100755
--- a/testsuite/expect/test1.11
+++ b/testsuite/expect/test1.11
@@ -55,7 +55,7 @@ print_header $test_id
 #
 set job_name      "AAAAABBBBBCCCCCDDDDDEEEEEFFFFFGGGGGHHHHHIIIIIJJJJJKKKKKLLLLLMMMMM"
 set job_id         0
-
+set timeout        $max_job_delay
 set srun_pid [spawn $srun --verbose --job-name=$job_name -t1 $bin_id]
 expect {
 	# needed for cray systems
diff --git a/testsuite/expect/test1.12 b/testsuite/expect/test1.12
index a3849e9d5f6f2f5223711aa32c4c6241eec25ccf..00372ab9b6957743d7410dc551e2d279dbd3cd58 100755
--- a/testsuite/expect/test1.12
+++ b/testsuite/expect/test1.12
@@ -55,6 +55,7 @@ make_bash_script $file_in "
   $scontrol show step \$SLURM_JOB_ID.\$SLURM_STEPID
 "
 
+set timeout $max_job_delay
 set srun_pid [spawn $srun -N1 -t1 --checkpoint=$ckpt_in ./$file_in]
 expect {
 	-re "Checkpoint=($number)" {
diff --git a/testsuite/expect/test1.13 b/testsuite/expect/test1.13
index 3b5a5d95e70f6a99b6ee4241e2c8c38b71bdb24c..49af4991dcb5501a5fbade744252ce524a0e5b9e 100755
--- a/testsuite/expect/test1.13
+++ b/testsuite/expect/test1.13
@@ -70,6 +70,7 @@ if {$matches != 1} {
 # Note the small value of timeout
 #
 set matches 0
+set timeout $max_job_delay
 set srun_pid [spawn $srun --immediate -v -t1 $bin_pwd]
 expect {
 	-re "error" {
diff --git a/testsuite/expect/test1.18 b/testsuite/expect/test1.18
index 02be33df02c19c9018d6d2205d0267fe323daa90..b4a909e6cb52e3ec7d4e9aa03d22e5cc04ef86ec 100755
--- a/testsuite/expect/test1.18
+++ b/testsuite/expect/test1.18
@@ -41,7 +41,8 @@ print_header $test_id
 #
 # Run a job attempting to get some dummy license name
 #
-set match 0
+set match   0
+set timeout $max_job_delay
 set srun_pid [spawn $srun --licenses=DUMMY_FOR_TESTING $bin_printenv SLURMD_NODENAME]
 expect {
 	-re "Invalid license" {