diff --git a/testsuite/expect/test17.15 b/testsuite/expect/test17.15
index 3cc18c6aa5a7bbc65b137f65b786cfc8efc6f185..1d91679100be040267060177e1893a05c05506be 100755
--- a/testsuite/expect/test17.15
+++ b/testsuite/expect/test17.15
@@ -95,6 +95,36 @@ expect {
 	}
 }
 
+if {$cur_core != -1} {
+	set limit_core [expr ($cur_core / 1024) - 2]
+	if {$limit_core < 1} {
+		set limit_core [expr $cur_core / 1024]
+	}
+}
+if {$cur_fsize != -1} {
+	set limit_fsize [expr ($cur_fsize / 1024) - 2]
+	if {$limit_fsize < 1} {
+		set limit_fsize [expr $cur_fsize / 1024]
+	}
+}
+if {$cur_nofile != -1} {
+	set limit_nofile [expr $cur_nofile - 2]
+	if {$limit_nofile < 1} {
+		set limit_nofile $cur_nofile
+	}
+}
+if {$cur_nproc != -1} {
+	set limit_nproc [expr $cur_nproc - 200]
+	if {$limit_nproc < 1} {
+		set limit_nofile $cur_nproc
+	}
+}
+if {$cur_stack != -1} {
+	set limit_stack [expr ($cur_stack / 1024) - 2]
+	if {$limit_stack < 1} {
+		set limit_stack [expr $cur_stack / 1024]
+	}
+}
 
 #
 # Spawn a job via sbatch to print environment variables and user limits