diff --git a/src/sbatch/sbatch.c b/src/sbatch/sbatch.c
index 094a94a804529fac39aff25d95242126d76b0689..b715bb331cdf4ef5a87ebe1606330df08eea9b99 100644
--- a/src/sbatch/sbatch.c
+++ b/src/sbatch/sbatch.c
@@ -127,7 +127,10 @@ int main(int argc, char *argv[])
 		
 		if (errno == ESLURM_ERROR_ON_DESC_TO_RECORD_COPY)
 			msg = "Slurm job queue full, sleeping and retrying.";
-		else if (errno == EAGAIN) {
+		else if (errno == ESLURM_NODES_BUSY) {
+			msg = "Job step creation temporarily disabled, "
+			      "retrying";
+		} else if (errno == EAGAIN) {
 			msg = "Slurm temporarily unable to accept job, "
 			      "sleeping and retrying.";
 		} else
diff --git a/testsuite/expect/test15.17 b/testsuite/expect/test15.17
index d96bcde454eb33d7e5c2b44d5f14cbc8f346152a..a67c2710868c22a01823364aa0e28c456b5a6440 100755
--- a/testsuite/expect/test15.17
+++ b/testsuite/expect/test15.17
@@ -33,7 +33,6 @@
 ############################################################################
 source ./globals
 
-slow_kill 45984
 set test_id      "15.17"
 set file_in      "test$test_id.input"
 set exit_code    0