diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
index 7b80ff83673..6c0c079955f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
@@ -539,7 +539,7 @@ public class TestPerColumnFamilyFlush {
     TEST_UTIL.getHBaseAdmin().createNamespace(
       NamespaceDescriptor.create(TABLENAME.getNamespaceAsString()).build());
     TEST_UTIL.getHBaseAdmin().createTable(htd);
-    getRegionWithName(TABLENAME).getFirst();
+    TEST_UTIL.waitTableAvailable(TABLENAME);
     Connection conn = ConnectionFactory.createConnection(conf);
     Table table = conn.getTable(TABLENAME);
     doPut(table, memstoreFlushSize);