diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
index affb684..d11b331 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
@@ -271,7 +271,7 @@ public class TableStateManager {
    */
   @Deprecated
   private void migrateZooKeeper() throws IOException {
-    if (this.master.getConfiguration().getBoolean(MIGRATE_TABLE_STATE_FROM_ZK_KEY, false)) {
+    if (!this.master.getConfiguration().getBoolean(MIGRATE_TABLE_STATE_FROM_ZK_KEY, false)) {
       return;
     }
     try {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableStateManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableStateManager.ja
index 80b41a4..92ffae6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableStateManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableStateManager.java
@@ -56,6 +56,8 @@ public class TestTableStateManager {

   @Before
   public void before() throws Exception {
+    TEST_UTIL.getConfiguration().setBoolean(TableStateManager.MIGRATE_TABLE_STATE_FROM_ZK_KEY,
+        true);
     TEST_UTIL.startMiniCluster();
   }