diff --git a/client/src/test/java/org/opensearch/geospatial/action/IpEnrichmentActionClientTests.java b/client/src/test/java/org/opensearch/geospatial/action/IpEnrichmentActionClientTests.java
index 73016c18..e91f7aa3 100644
--- a/client/src/test/java/org/opensearch/geospatial/action/IpEnrichmentActionClientTests.java
+++ b/client/src/test/java/org/opensearch/geospatial/action/IpEnrichmentActionClientTests.java
@@ -13,13 +13,10 @@
 import java.util.concurrent.ExecutionException;
 
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.action.ActionFuture;
 import org.opensearch.core.action.ActionResponse;
diff --git a/client/src/test/java/org/opensearch/geospatial/action/IpEnrichmentRequestTests.java b/client/src/test/java/org/opensearch/geospatial/action/IpEnrichmentRequestTests.java
index 63740f9a..af815ca4 100644
--- a/client/src/test/java/org/opensearch/geospatial/action/IpEnrichmentRequestTests.java
+++ b/client/src/test/java/org/opensearch/geospatial/action/IpEnrichmentRequestTests.java
@@ -33,7 +33,6 @@ public void testValidateNullDataSourceName() {
         Assert.assertEquals(1, request.validate().validationErrors().size());
     }
 
-
     /**
      * Test validate() against an invalid record,
      * Expecting an error being thrown as ipString being null.
@@ -44,7 +43,6 @@ public void testValidateNullIpString() {
         Assert.assertEquals(1, request.validate().validationErrors().size());
     }
 
-
     /**
      * Test validate() against an invalid record,
      * Expecting an error with size in 2, because both fields are null.
diff --git a/src/test/java/org/opensearch/geospatial/ip2geo/action/IpEnrichmentTransportActionTests.java b/src/test/java/org/opensearch/geospatial/ip2geo/action/IpEnrichmentTransportActionTests.java
index 9605377b..ca431f5a 100644
--- a/src/test/java/org/opensearch/geospatial/ip2geo/action/IpEnrichmentTransportActionTests.java
+++ b/src/test/java/org/opensearch/geospatial/ip2geo/action/IpEnrichmentTransportActionTests.java
@@ -6,16 +6,10 @@
 package org.opensearch.geospatial.ip2geo.action;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Collections;
-import java.util.List;
 
 import org.junit.Before;
-import org.junit.Test;
 import org.mockito.Mock;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.action.ActionResponse;
@@ -46,8 +40,7 @@ public void init() {
     /**
      * When dataSource is provided.
      */
-    @Test
-    public void testDoExecute_All_Succeed() {
+    public void testDoExecuteAllSucceed() {
         IpEnrichmentRequest request = new IpEnrichmentRequest("192.168.1.1", "testSource");
         action.doExecute(task, request, listener);