diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
index 49ce17898..68e3b23fc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
@@ -44,7 +44,6 @@
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch.indices.get_index_template.IndexTemplate;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
diff --git a/java-client/src/test/java/org/opensearch/client/transport/util/FunnellingHttpsProxy.java b/java-client/src/test/java/org/opensearch/client/transport/util/FunnellingHttpsProxy.java
index 19b62a7eb..eef241648 100644
--- a/java-client/src/test/java/org/opensearch/client/transport/util/FunnellingHttpsProxy.java
+++ b/java-client/src/test/java/org/opensearch/client/transport/util/FunnellingHttpsProxy.java
@@ -28,7 +28,7 @@
 import org.apache.hc.core5.http.impl.EnglishReasonPhraseCatalog;
 
 public class FunnellingHttpsProxy implements Closeable {
-    private static final int SO_TIMEOUT = 5000;
+    private static final int SO_TIMEOUT = 10000;
 
     @Nonnull
     private final ServerSocket serverSocket;