diff --git a/src/plugins/checkpoint/blcr/checkpoint_blcr.c b/src/plugins/checkpoint/blcr/checkpoint_blcr.c
index 575df897f9d89ba118d2938c8a491d2f575c74b6..b1e1ca367d953e86aa3e145fb33abd87528c08e4 100644
--- a/src/plugins/checkpoint/blcr/checkpoint_blcr.c
+++ b/src/plugins/checkpoint/blcr/checkpoint_blcr.c
@@ -312,7 +312,7 @@ extern int slurm_ckpt_comp ( struct step_record * step_ptr, time_t event_time,
 		uint32_t error_code, char *error_msg )
 {
 	error("checkpoint/blcr: slurm_ckpt_comp not implemented");
-	return SLURM_FAILURE;
+	return ESLURM_NOT_SUPPORTED;
 }
 
 extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
@@ -320,7 +320,7 @@ extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
 				  uint32_t error_code, char *error_msg )
 {
 	error("checkpoint/blcr: slurm_ckpt_task_comp not implemented");
-	return SLURM_FAILURE;
+	return ESLURM_NOT_SUPPORTED;
 }
 
 extern int slurm_ckpt_alloc_job(check_jobinfo_t *jobinfo)
diff --git a/testsuite/expect/test11.5 b/testsuite/expect/test11.5
index 62b6b0589f8ed06b1666d80f71f234f804c5068b..14f80b2bc4ea8c80f8e70f221379f86cb7065db3 100755
--- a/testsuite/expect/test11.5
+++ b/testsuite/expect/test11.5
@@ -180,7 +180,7 @@ expect {
 set matches 0
 spawn $scontrol check able $job_id.0
 expect {
-	-re "Began at" {
+	-re "(Yes|Began at)" {
 		incr matches
 		exp_continue
 	}
@@ -221,6 +221,11 @@ expect {
 		incr matches
 		exp_continue
 	}
+	-re "Job step not running" {
+		send_user "\nNot a problem if the checkpoint completed\n"
+		incr matches
+		exp_continue
+	}
 	-re "Requested operation not supported on this system" {
 		incr matches
 		exp_continue