diff --git a/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/systemtopic/SystemTopicBasedSystemEventService.java b/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/systemtopic/SystemTopicBasedSystemEventService.java
index f68b203ae..072bb4ff2 100644
--- a/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/systemtopic/SystemTopicBasedSystemEventService.java
+++ b/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/systemtopic/SystemTopicBasedSystemEventService.java
@@ -16,6 +16,7 @@
 import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.annotations.Beta;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -131,9 +132,10 @@ public CompletableFuture<Void> sendEvent(MqttEvent event) {
 
     protected CompletableFuture<SystemTopicClient.Reader<MqttEvent>> createReader() {
         CompletableFuture<SystemTopicClient.Reader<MqttEvent>> result = new CompletableFuture<>();
-        Backoff backoff = new Backoff(1, TimeUnit.SECONDS,
-                3, TimeUnit.SECONDS,
-                10, TimeUnit.SECONDS);
+        Backoff backoff = Backoff.builder()
+                .initialDelay(Duration.ofSeconds(1))
+                .mandatoryStop(Duration.ofSeconds(10))
+                .maxBackoff(Duration.ofSeconds(3)).build();
         RetryUtil.retryAsynchronously(systemTopicClient::newReaderAsync, backoff, pulsarService.getExecutor(), result);
         return result;
     }
diff --git a/mqtt-proxy/src/main/java/io/streamnative/pulsar/handlers/mqtt/proxy/handler/PulsarServiceLookupHandler.java b/mqtt-proxy/src/main/java/io/streamnative/pulsar/handlers/mqtt/proxy/handler/PulsarServiceLookupHandler.java
index 7d0497f49..e06a37f69 100644
--- a/mqtt-proxy/src/main/java/io/streamnative/pulsar/handlers/mqtt/proxy/handler/PulsarServiceLookupHandler.java
+++ b/mqtt-proxy/src/main/java/io/streamnative/pulsar/handlers/mqtt/proxy/handler/PulsarServiceLookupHandler.java
@@ -17,6 +17,7 @@
 import io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils;
 import io.streamnative.pulsar.handlers.mqtt.proxy.MQTTProxyConfiguration;
 import java.net.InetSocketAddress;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -39,7 +40,6 @@
 import org.apache.pulsar.client.util.ScheduledExecutorProvider;
 import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.util.Backoff;
-import org.apache.pulsar.common.util.BackoffBuilder;
 import org.apache.pulsar.common.util.FutureUtil;
 import org.apache.pulsar.metadata.api.MetadataCache;
 import org.apache.pulsar.policies.data.loadbalancer.LocalBrokerData;
@@ -121,7 +121,7 @@ && isLookupMQTTBroker(lookupPair, brokerData.get()))
                 })
                 .thenAccept(future::complete)
                 .exceptionally(e -> {
-                    long nextDelay = Math.min(backoff.next(), remainingTime.get());
+                    long nextDelay = Math.min(backoff.next().toMillis(), remainingTime.get());
                     // skip retry scheduler when `TooManyRequestsException`
                     boolean isLookupThrottling = !PulsarClientException.isRetriableError(e.getCause())
                             || e.getCause() instanceof PulsarClientException.TooManyRequestsException
@@ -145,11 +145,10 @@ && isLookupMQTTBroker(lookupPair, brokerData.get()))
     public CompletableFuture<InetSocketAddress> findBroker(TopicName topicName) {
         CompletableFuture<InetSocketAddress> lookupResult = new CompletableFuture<>();
         AtomicLong opTimeoutMs = new AtomicLong(proxyConfig.getLookupOperationTimeoutMs());
-        Backoff backoff = new BackoffBuilder()
-                .setInitialTime(100, TimeUnit.MILLISECONDS)
-                .setMandatoryStop(opTimeoutMs.get() * 2, TimeUnit.MILLISECONDS)
-                .setMax(proxyConfig.getMaxLookupIntervalMs(), TimeUnit.MILLISECONDS)
-                .create();
+        Backoff backoff = Backoff.builder()
+                .initialDelay(Duration.ofMillis(100))
+                .mandatoryStop(Duration.ofMillis(opTimeoutMs.get() * 2))
+                .maxBackoff(Duration.ofMillis(proxyConfig.getMaxLookupIntervalMs())).build();
 
         findBroker(topicName, backoff, opTimeoutMs, lookupResult);
         return lookupResult;
diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/broker/AdapterChannelTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/broker/AdapterChannelTest.java
index 60d45d7a7..c1044884c 100644
--- a/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/broker/AdapterChannelTest.java
+++ b/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/broker/AdapterChannelTest.java
@@ -39,10 +39,12 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 import org.mockito.Mockito;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 
 @Test(enabled = false)
+@Ignore
 public class AdapterChannelTest extends MQTTTestBase {
 
     @Override
diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/mqtt3/fusesource/proxy/ProxyTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/mqtt3/fusesource/proxy/ProxyTest.java
index cdfc5f318..8d6981e67 100644
--- a/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/mqtt3/fusesource/proxy/ProxyTest.java
+++ b/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/mqtt3/fusesource/proxy/ProxyTest.java
@@ -67,12 +67,15 @@
 import org.fusesource.mqtt.client.Topic;
 import org.mockito.Mockito;
 import org.testng.Assert;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 /**
  * Integration tests for MQTT protocol handler with proxy.
  */
 @Slf4j
+@Ignore
+@Test(enabled = false)
 public class ProxyTest extends MQTTTestBase {
 
     @Override
diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/mqtt5/hivemq/base/ProxyMtlsTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/mqtt5/hivemq/base/ProxyMtlsTest.java
index 67c4cafca..3c4a12acd 100644
--- a/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/mqtt5/hivemq/base/ProxyMtlsTest.java
+++ b/tests/src/test/java/io/streamnative/pulsar/handlers/mqtt/mqtt5/hivemq/base/ProxyMtlsTest.java
@@ -58,9 +58,11 @@
 import org.fusesource.mqtt.client.QoS;
 import org.fusesource.mqtt.client.Topic;
 import org.testng.Assert;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 @Test(enabled = false)
+@Ignore
 public class ProxyMtlsTest extends MQTTTestBase {