diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/tpch/CalcitePPLTpchIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/tpch/CalcitePPLTpchIT.java
index 9f0d2dca78d..0ca9c66c488 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/tpch/CalcitePPLTpchIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/tpch/CalcitePPLTpchIT.java
@@ -14,7 +14,9 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySchemaInOrder;
 
 import java.io.IOException;
+import java.util.Locale;
 import org.json.JSONObject;
+import org.junit.Assume;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opensearch.sql.ppl.PPLIntegTestCase;
@@ -176,6 +178,8 @@ public void testQ6() throws IOException {
 
   @Test
   public void testQ7() throws IOException {
+    String osName = System.getProperty("os.name").toLowerCase(Locale.ROOT);
+    Assume.assumeFalse("testQ7 on macOS CI could socket timeout", osName.contains("mac"));
     String ppl = sanitize(loadFromFile("tpch/queries/q7.ppl"));
     JSONObject actual = executeQuery(ppl);
     verifySchemaInOrder(
diff --git a/integ-test/src/test/java/org/opensearch/sql/util/RetryProcessor.java b/integ-test/src/test/java/org/opensearch/sql/util/RetryProcessor.java
index d747ebfed7d..e8f12aac566 100644
--- a/integ-test/src/test/java/org/opensearch/sql/util/RetryProcessor.java
+++ b/integ-test/src/test/java/org/opensearch/sql/util/RetryProcessor.java
@@ -5,6 +5,7 @@
 
 package org.opensearch.sql.util;
 
+import java.util.Optional;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.rules.TestWatcher;
@@ -17,7 +18,9 @@ public class RetryProcessor extends TestWatcher {
 
   @Override
   public Statement apply(Statement base, Description description) {
-    Retry retry = description.getAnnotation(Retry.class);
+    Retry retry =
+        Optional.ofNullable(description.getAnnotation(Retry.class))
+            .orElseGet(() -> description.getTestClass().getAnnotation(Retry.class));
     if (retry == null) {
       return base;
     }