diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java
index 4a098fd0eb9f0..33e4e998ad6cf 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java
@@ -161,6 +161,7 @@ public void cleanup() throws Exception {
 
     @Test
     public void testEntryLookup() throws Exception {
+        @Cleanup
         BookKeeper bk = pulsar.getBookKeeperClientFactory().create(
                 this.conf, null, null, Optional.empty(), null);
 
@@ -216,6 +217,7 @@ public void testEntryLookup() throws Exception {
 
     @Test
     public void testCleanupOldCompactedTopicLedger() throws Exception {
+        @Cleanup
         BookKeeper bk = pulsar.getBookKeeperClientFactory().create(
                 this.conf, null, null, Optional.empty(), null);
 
@@ -845,6 +847,7 @@ public void testReadCompactedLatestMessageWithInclusive() throws Exception {
 
     @Test
     public void testCompactWithConcurrentGetCompactionHorizonAndCompactedTopicContext() throws Exception {
+        @Cleanup
         BookKeeper bk0 = pulsar.getBookKeeperClientFactory().create(
                 this.conf, null, null, Optional.empty(), null);
 
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/ServiceUnitStateCompactionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/ServiceUnitStateCompactionTest.java
index e4f0750a981c9..09c3ebe419394 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/ServiceUnitStateCompactionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/ServiceUnitStateCompactionTest.java
@@ -168,7 +168,7 @@ public void setup() throws Exception {
     @Override
     public void cleanup() throws Exception {
         super.internalCleanup();
-
+        bk.close();
         if (compactionScheduler != null) {
             compactionScheduler.shutdownNow();
         }