diff --git a/src/plugins/task/cgroup/task_cgroup_cpuset.c b/src/plugins/task/cgroup/task_cgroup_cpuset.c
index 449aaf55378137cb8a1e6ed16cec6d321ab25684..93c01c3f985e24946843688cfb9737994947aaba 100644
--- a/src/plugins/task/cgroup/task_cgroup_cpuset.c
+++ b/src/plugins/task/cgroup/task_cgroup_cpuset.c
@@ -1107,6 +1107,13 @@ extern int task_cgroup_cpuset_fini(slurm_cgroup_conf_t *slurm_cgroup_conf)
 				xfree(pids);
 			} while ((i < npids) && (cnt < MAX_MOVE_WAIT));
 
+			if (cnt < MAX_MOVE_WAIT)
+				debug3("Took %d checks before stepd pid was removed from the step cgroup.",
+				       cnt);
+			else
+				error("Pid %d is still in the step cgroup.  It might be left uncleaned after the job.",
+				      getpid());
+
                         if (xcgroup_delete(&step_cpuset_cg) != SLURM_SUCCESS)
                                 debug2("task/cgroup: unable to remove step "
                                        "cpuset : %m");
diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c
index a3a3c6a6a77fd31838d7980826a7cb463b268ffc..6a09b3d52a7601d50398dee0d3fc1940fcf5ce1b 100644
--- a/src/plugins/task/cgroup/task_cgroup_devices.c
+++ b/src/plugins/task/cgroup/task_cgroup_devices.c
@@ -142,6 +142,13 @@ extern int task_cgroup_devices_fini(slurm_cgroup_conf_t *slurm_cgroup_conf)
 				xfree(pids);
 			} while ((i < npids) && (cnt < MAX_MOVE_WAIT));
 
+			if (cnt < MAX_MOVE_WAIT)
+				debug3("Took %d checks before stepd pid was removed from the step cgroup.",
+				       cnt);
+			else
+				error("Pid %d is still in the step cgroup.  It might be left uncleaned after the job.",
+				      getpid());
+
 			if (xcgroup_delete(&step_devices_cg) != SLURM_SUCCESS)
                                 debug2("task/cgroup: unable to remove step "
                                        "devices : %m");