diff --git a/NEWS b/NEWS
index a7273ff799629015027ebd21a846b0d416177394..1385e9055f0c9dd92b733e8e6855688f1795ea50 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ documents those changes that are of interest to users and administrators.
  -- Clear Dependency field when all dependencies are satisfied.
  -- Add --array-unique to squeue which will display one unique pending job
     array element per line.
+ -- Reset backfill timers correctly without skipping over them in certain
+    circumstances.
 
 * Changes in Slurm 17.02.2
 ==========================
diff --git a/src/plugins/sched/backfill/backfill.c b/src/plugins/sched/backfill/backfill.c
index 5e5103b3d7e77e3c9576a5e6770ebe593b02700b..5465bab82b3f5dc3bf0f080a5240f05bf223cdea 100644
--- a/src/plugins/sched/backfill/backfill.c
+++ b/src/plugins/sched/backfill/backfill.c
@@ -1390,6 +1390,13 @@ next_task:
 				break;
 			}
 
+			/* Reset backfill scheduling timers, resume testing */
+			sched_start = time(NULL);
+			gettimeofday(&start_tv, NULL);
+			job_test_count = 1;
+			test_time_count = 0;
+			START_TIMER;
+
 			/* With bf_continue configured, the original job could
 			 * have been scheduled or cancelled and purged.
 			 * Revalidate job the record here. */
@@ -1408,12 +1415,6 @@ next_task:
 
 			job_ptr->time_limit = save_time_limit;
 			job_ptr->part_ptr = part_ptr;
-			/* Reset backfill scheduling timers, resume testing */
-			sched_start = time(NULL);
-			gettimeofday(&start_tv, NULL);
-			job_test_count = 1;
-			test_time_count = 0;
-			START_TIMER;
 		}
 
 		FREE_NULL_BITMAP(avail_bitmap);