diff --git a/integ-test/build.gradle b/integ-test/build.gradle
index fd443ee9b2..813d66c022 100644
--- a/integ-test/build.gradle
+++ b/integ-test/build.gradle
@@ -73,7 +73,6 @@ ext {
         def snapshotVersion = metadata.versioning.snapshotVersions[0].snapshotVersion[0].value[0].text()
 
         return repo + "opensearch-security-${snapshotVersion}.zip"
-        //return "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-security/3.0.0.0-SNAPSHOT/opensearch-security-3.0.0.0-20230801.181212-166.zip"
     }
 }
 
@@ -112,7 +111,6 @@ dependencies {
     testImplementation group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}"
     testImplementation group: 'org.opensearch.driver', name: 'opensearch-sql-jdbc', version: System.getProperty("jdbcDriverVersion", '1.2.0.0')
     testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
-    //testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version: '2.1'
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.20.0'
     testImplementation project(':opensearch-sql-plugin')
     testImplementation project(':legacy')
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java b/integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java
index db39aadf1c..cd1b4ff2ef 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java
@@ -97,7 +97,7 @@ protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOE
     if (isHttps()) {
       configureHttpsClient(builder, settings, hosts[0]);
     } else {
-      configureClient(builder, settings, hosts[0]);
+      configureClient(builder, settings);
     }
 
     builder.setStrictDeprecationMode(false);
@@ -201,7 +201,8 @@ protected static void wipeAllOpenSearchIndices(RestClient client) throws IOExcep
     }
   }
 
-  protected static void configureClient(RestClientBuilder builder, Settings settings, HttpHost httpHost) throws IOException {
+  protected static void configureClient(RestClientBuilder builder, Settings settings)
+      throws IOException {
     String userName = System.getProperty("user");
     String password = System.getProperty("password");
     if (userName != null && password != null) {
@@ -213,7 +214,7 @@ protected static void configureClient(RestClientBuilder builder, Settings settin
         return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
       });
     }
-    configureClient(builder, settings);
+    OpenSearchRestTestCase.configureClient(builder, settings);
   }
 
   protected static void configureHttpsClient(RestClientBuilder builder, Settings settings,