diff --git a/build.gradle b/build.gradle
index 20b42c5..4f13036 100644
--- a/build.gradle
+++ b/build.gradle
@@ -259,18 +259,9 @@ integTest {
   if (System.getProperty("test.debug") != null) {
     jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
   }
-  // NOTE: this IT config discovers only junit5 (jupiter) tests.
-  // https://github.com/opensearch-project/sql/issues/1974
-  filter {
-    includeTestsMatching 'org.opensearch.plugin.insights.rules.resthandler.top_queries.TopQueriesRestIT'
-  }
-
-  if (System.getProperty("security.enabled") == "true") {
-    getClusters().forEach { cluster ->
-      configureSecurityPlugin(cluster)
-    }
-    systemProperty "user", "admin"
-    systemProperty "password", "admin"
+  if (System.getProperty("security.enabled") == "true" || System.getProperty("https") == "true") {
+    // Exclude this IT, because they executed in another task (:integTestWithSecurity)
+    exclude 'org/opensearch/plugin/insights/rules/resthandler/top_queries/TopQueriesRestIT.class'
   }
 }
 
@@ -341,8 +332,6 @@ task integTestWithSecurity(type: RestIntegTestTask) {
     jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
   }
 
-  // NOTE: this IT config discovers only junit5 (jupiter) tests.
-  // https://github.com/opensearch-project/sql/issues/1974
   filter {
     includeTestsMatching 'org.opensearch.plugin.insights.rules.resthandler.top_queries.TopQueriesRestIT'
   }