diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
index 70afecc24d8..f5d295d529f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
@@ -45,6 +45,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -1909,11 +1910,10 @@ public class TestHBaseFsck {
       @Override
       public HFileCorruptionChecker createHFileCorruptionChecker(boolean sidelineCorruptHFiles) throws IOException {
         return new HFileCorruptionChecker(conf, executor, sidelineCorruptHFiles) {
-          boolean attemptedFirstHFile = false;
+          AtomicBoolean attemptedFirstHFile = new AtomicBoolean(false);
           @Override
           protected void checkHFile(Path p) throws IOException {
-            if (!attemptedFirstHFile) {
-              attemptedFirstHFile = true;
+            if (attemptedFirstHFile.compareAndSet(false, true)) {
               assertTrue(fs.delete(p, true)); // make sure delete happened.
             }
             super.checkHFile(p);
@@ -1940,11 +1940,10 @@ public class TestHBaseFsck {
       @Override
       public HFileCorruptionChecker createHFileCorruptionChecker(boolean sidelineCorruptHFiles) throws IOException {
         return new HFileCorruptionChecker(conf, executor, sidelineCorruptHFiles) {
-          boolean attemptedFirstFamDir = false;
+          AtomicBoolean attemptedFirstHFile = new AtomicBoolean(false);
           @Override
           protected void checkColFamDir(Path p) throws IOException {
-            if (!attemptedFirstFamDir) {
-              attemptedFirstFamDir = true;
+            if (attemptedFirstHFile.compareAndSet(false, true)) {
               assertTrue(fs.delete(p, true)); // make sure delete happened.
             }
             super.checkColFamDir(p);
@@ -1969,11 +1968,10 @@ public class TestHBaseFsck {
       @Override
       public HFileCorruptionChecker createHFileCorruptionChecker(boolean sidelineCorruptHFiles) throws IOException {
         return new HFileCorruptionChecker(conf, executor, sidelineCorruptHFiles) {
-          boolean attemptedFirstRegionDir = false;
+          AtomicBoolean attemptedFirstHFile = new AtomicBoolean(false);
           @Override
           protected void checkRegionDir(Path p) throws IOException {
-            if (!attemptedFirstRegionDir) {
-              attemptedFirstRegionDir = true;
+            if (attemptedFirstHFile.compareAndSet(false, true)) {
               assertTrue(fs.delete(p, true)); // make sure delete happened.
             }
             super.checkRegionDir(p);