diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
index c6cd861884a..db4ac327bb0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
@@ -150,7 +150,7 @@ implements ServerProcedureInterface {
 
       case SERVER_CRASH_GET_REGIONS:
         // If hbase:meta is not assigned, yield.
-        if (env.getAssignmentManager().waitMetaInitialized(this)) {
+        if (env.getAssignmentManager().waitMetaLoaded(this)) {
           throw new ProcedureSuspendedException();
         }
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java
index e34e3582ad8..b64905e2f53 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java
@@ -93,7 +93,6 @@ public class TestServerCrashProcedure {
   }
 
   @Test(timeout=60000)
-  @Ignore // Fix for AMv2
   public void testRecoveryAndDoubleExecutionOnRsWithoutMeta() throws Exception {
     testRecoveryAndDoubleExecution(false);
   }