diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index 145a9522306..22ac7fedf1c 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -747,7 +747,7 @@ public void run() {
                         LOG.error("Failed to update nameServer address list", e);
                     }
                 }
-            }, 1000 * 10, 1000 * 60 * 2, TimeUnit.MILLISECONDS);
+            }, 1000 * 10, this.brokerConfig.getUpdateNameServerAddrPeriod(), TimeUnit.MILLISECONDS);
         } else if (this.brokerConfig.isFetchNamesrvAddrByAddressServer()) {
             this.scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
 
diff --git a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
index 10bf7f76e86..26afe593a25 100644
--- a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
+++ b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
@@ -185,6 +185,11 @@ public class BrokerConfig extends BrokerIdentity {
      */
     private int registerNameServerPeriod = 1000 * 30;
 
+    /**
+     * This configurable item defines interval of update name server address. Default: 120 * 1000 milliseconds
+     */
+    private int updateNameServerAddrPeriod = 1000 * 120;
+
     /**
      * the interval to send heartbeat to name server for liveness detection.
      */
@@ -1837,4 +1842,12 @@ public boolean isSkipWhenCKRePutReachMaxTimes() {
     public void setSkipWhenCKRePutReachMaxTimes(boolean skipWhenCKRePutReachMaxTimes) {
         this.skipWhenCKRePutReachMaxTimes = skipWhenCKRePutReachMaxTimes;
     }
+
+    public int getUpdateNameServerAddrPeriod() {
+        return updateNameServerAddrPeriod;
+    }
+
+    public void setUpdateNameServerAddrPeriod(int updateNameServerAddrPeriod) {
+        this.updateNameServerAddrPeriod = updateNameServerAddrPeriod;
+    }
 }
diff --git a/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java b/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
index 1e4bbf21bd2..386cb1f6787 100644
--- a/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
@@ -41,6 +41,7 @@
 import org.apache.rocketmq.store.StoreCheckpoint;
 import org.apache.rocketmq.store.config.StorePathConfigHelper;
 import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.Assume;
 import org.apache.rocketmq.common.MixAll;
@@ -51,6 +52,12 @@
 
 public class DLedgerCommitlogTest extends MessageStoreTestBase {
 
+    @BeforeClass
+    public static void beforeClass() {
+        // Temporarily skip those tests on the macOS as they are flaky
+        Assume.assumeFalse(MixAll.isMac());
+    }
+
     @Test
     public void testTruncateCQ() throws Exception {
         String base = createBaseDir();
diff --git a/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerMultiPathTest.java b/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerMultiPathTest.java
index 5eb83207322..9de4e4820ed 100644
--- a/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerMultiPathTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerMultiPathTest.java
@@ -39,6 +39,7 @@ public class DLedgerMultiPathTest extends MessageStoreTestBase {
 
     @Test
     public void multiDirsStorageTest() throws Exception {
+        Assume.assumeFalse(MixAll.isMac());
         Assume.assumeFalse(MixAll.isWindows());
         String base = createBaseDir();
         String topic = UUID.randomUUID().toString();
diff --git a/store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java b/store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
index db7b594a73b..1bfc6f72eaa 100644
--- a/store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
@@ -34,6 +34,7 @@ public class MixCommitlogTest extends MessageStoreTestBase {
     @Test
     public void testFallBehindCQ() throws Exception {
         Assume.assumeFalse(MixAll.isWindows());
+        Assume.assumeFalse(MixAll.isMac());
         String base = createBaseDir();
         String topic = UUID.randomUUID().toString();
         String peers = String.format("n0-localhost:%d", nextPort());
@@ -75,6 +76,7 @@ public void testFallBehindCQ() throws Exception {
 
     @Test
     public void testPutAndGet() throws Exception {
+        Assume.assumeFalse(MixAll.isMac());
         String base = createBaseDir();
         String topic = UUID.randomUUID().toString();
         String peers = String.format("n0-localhost:%d", nextPort());
@@ -138,6 +140,7 @@ public void testPutAndGet() throws Exception {
 
     @Test
     public void testDeleteExpiredFiles() throws Exception {
+        Assume.assumeFalse(MixAll.isMac());
         String base = createBaseDir();
         String topic = UUID.randomUUID().toString();
         String peers = String.format("n0-localhost:%d", nextPort());