diff --git a/pom.xml b/pom.xml
index 8c8db111..39441264 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
 
         <junit-jupiter.version>5.14.2</junit-jupiter.version>
         <junit-platform.version>1.14.2</junit-platform.version>
-        <netty-handler.version>4.2.9.Final</netty-handler.version>
+        <netty-handler.version>4.1.124.Final</netty-handler.version>
 
         <plugin.surefire.version>3.5.4</plugin.surefire.version>
         <plugin.jacoco.version>0.8.14</plugin.jacoco.version>
@@ -98,6 +98,18 @@
         <plugin.javadoc.version>3.12.0</plugin.javadoc.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-bom</artifactId>
+                <version>1.75.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
 
         <dependency>
diff --git a/src/test/java/com/influxdb/v3/client/integration/E2ETest.java b/src/test/java/com/influxdb/v3/client/integration/E2ETest.java
index 63c95afa..917b606f 100644
--- a/src/test/java/com/influxdb/v3/client/integration/E2ETest.java
+++ b/src/test/java/com/influxdb/v3/client/integration/E2ETest.java
@@ -110,15 +110,16 @@ void correctSslCertificates() throws Exception {
                 .database(System.getenv("TESTING_INFLUXDB_DATABASE"))
                 .sslRootsFilePath(influxDBcertificateFile)
                 .build();
-        InfluxDBClient influxDBClient = InfluxDBClient.getInstance(clientConfig);
-        assertGetDataSuccess(influxDBClient);
+        try (InfluxDBClient influxDBClient = InfluxDBClient.getInstance(clientConfig)) {
+            assertGetDataSuccess(influxDBClient);
+        }
     }
 
     @EnabledIfEnvironmentVariable(named = "TESTING_INFLUXDB_URL", matches = ".*")
     @EnabledIfEnvironmentVariable(named = "TESTING_INFLUXDB_TOKEN", matches = ".*")
     @EnabledIfEnvironmentVariable(named = "TESTING_INFLUXDB_DATABASE", matches = ".*")
     @Test
-    void disableServerCertificateValidation() {
+    void disableServerCertificateValidation() throws Exception {
         String wrongCertificateFile = "src/test/java/com/influxdb/v3/client/testdata/docker.com.pem";
 
         ClientConfig clientConfig = new ClientConfig.Builder()
@@ -130,8 +131,9 @@ void disableServerCertificateValidation() {
                 .build();
 
         // Test succeeded with wrong certificate file because disableServerCertificateValidation is true
-        InfluxDBClient influxDBClient = InfluxDBClient.getInstance(clientConfig);
-        assertGetDataSuccess(influxDBClient);
+        try (InfluxDBClient influxDBClient = InfluxDBClient.getInstance(clientConfig)) {
+            assertGetDataSuccess(influxDBClient);
+        }
     }
 
     @EnabledIfEnvironmentVariable(named = "TESTING_INFLUXDB_URL", matches = ".*")
@@ -196,8 +198,9 @@ public void testQueryRows() throws Exception {
             String uuid = UUID.randomUUID().toString();
             String measurement = "host22";
             List<Map<String, Object>> testDatas = new ArrayList<>();
+            long baseTimestamp = System.currentTimeMillis();
             for (int i = 0; i <= 9; i++) {
-                long timestamp = System.currentTimeMillis();
+                long timestamp = baseTimestamp + i;
                 Map<String, Object> map = Map.of(
                         "measurement", measurement,
                         "tag", "tagValue",
@@ -230,6 +233,8 @@ public void testQueryRows() throws Exception {
                 testDatas.add(map);
             }
 
+            Thread.sleep(2_000);
+
             Map<String, Object> parameters = Map.of("testId", uuid);
             // Result set much be ordered by time
             String sql = String.format("Select * from %s where \"testId\"=$testId order by time", measurement);
@@ -274,8 +279,9 @@ public void testQueryRowWithOptions() throws Exception {
             String uuid = UUID.randomUUID().toString();
             String measurement = "host21";
             List<Map<String, Object>> testDatas = new ArrayList<>();
+            long baseTimestamp = System.currentTimeMillis();
             for (int i = 0; i <= 9; i++) {
-                long timestamp = System.currentTimeMillis();
+                long timestamp = baseTimestamp + i;
                 Map<String, Object> map = Map.of(
                         "measurement", measurement,
                         "tag", "tagValue",
@@ -308,6 +314,8 @@ public void testQueryRowWithOptions() throws Exception {
                 testDatas.add(map);
             }
 
+            Thread.sleep(2_000);
+
             // Result set much be ordered by time
             String sql = String.format("Select * from %s where \"testId\"='%s' order by time", measurement, uuid);
             try (Stream<Map<String, Object>> stream = client.queryRows(sql, QueryOptions.defaultQueryOptions())) {
@@ -417,6 +425,12 @@ public void testNoAllocatorMemoryLeak() {
                         .setTimestamp(now));
 
                 client.writePoints(points);
+                try {
+                    Thread.sleep(2_000);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    throw new RuntimeException(e);
+                }
                 String query = "SELECT * FROM " + measurement;
 
                 try (Stream<PointValues> stream = client.queryPoints(query)) {
@@ -469,6 +483,7 @@ public void testMultipleQueries() throws Exception {
                     .setTimestamp(now));
 
             client.writePoints(points);
+            Thread.sleep(2_000);
             String query = "SELECT * FROM " + measurement;
 
             for (int i = 0; i < 20; i++) {
diff --git a/src/test/java/com/influxdb/v3/client/query/QueryOptionsTest.java b/src/test/java/com/influxdb/v3/client/query/QueryOptionsTest.java
index c17e118f..b11b30f6 100644
--- a/src/test/java/com/influxdb/v3/client/query/QueryOptionsTest.java
+++ b/src/test/java/com/influxdb/v3/client/query/QueryOptionsTest.java
@@ -39,8 +39,12 @@
 import org.apache.arrow.flight.CallOption;
 import org.apache.arrow.flight.CallOptions;
 import org.apache.arrow.flight.CallStatus;
+import org.apache.arrow.flight.FlightProducer.CallContext;
+import org.apache.arrow.flight.FlightProducer.ServerStreamListener;
 import org.apache.arrow.flight.FlightRuntimeException;
 import org.apache.arrow.flight.FlightServer;
+import org.apache.arrow.flight.NoOpFlightProducer;
+import org.apache.arrow.flight.Ticket;
 import org.apache.arrow.flight.impl.FlightServiceGrpc;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -48,6 +52,7 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import com.influxdb.v3.client.InfluxDBClient;
 import com.influxdb.v3.client.PointValues;
@@ -186,6 +191,53 @@ void setInboundMessageSizeLarge() throws Exception {
         }
     }
 
+    @Test
+    @Timeout(5)
+    void queryTimeout() throws Exception {
+        int freePort = findFreePort();
+        URI uri = URI.create("http://127.0.0.1:" + freePort);
+        try (VectorSchemaRoot vectorSchemaRoot = TestUtils.generateVectorSchemaRoot(1, 1);
+             BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
+             FlightServer flightServer = TestUtils.simpleFlightServer(uri, allocator, new NoOpFlightProducer() {
+                 @Override
+                 public void getStream(final CallContext context,
+                                       final Ticket ticket,
+                                       final ServerStreamListener listener) {
+                     listener.start(vectorSchemaRoot);
+                     try {
+                         Thread.sleep(1000);
+                     } catch (InterruptedException e) {
+                         Thread.currentThread().interrupt();
+                     }
+                     listener.completed();
+                 }
+             })
+        ) {
+            flightServer.start();
+
+            String host = String.format("http://%s:%d", uri.getHost(), uri.getPort());
+            ClientConfig clientConfig = new ClientConfig.Builder()
+                .host(host)
+                .database("test")
+                .queryTimeout(Duration.ofMillis(200))
+                .build();
+
+            try (InfluxDBClient influxDBClient = InfluxDBClient.getInstance(clientConfig)) {
+                Throwable thrown = Assertions.catchThrowable(() -> {
+                    try (Stream<PointValues> stream = influxDBClient.queryPoints(
+                        "Select * from \"nothing\""
+                    )) {
+                        stream.count();
+                    }
+                });
+
+                Assertions.assertThat(thrown).isInstanceOf(FlightRuntimeException.class);
+                FlightRuntimeException fre = (FlightRuntimeException) thrown;
+                Assertions.assertThat(fre.status().code()).isEqualTo(CallStatus.TIMED_OUT.code());
+            }
+        }
+    }
+
     @Test
     void defaultGrpcCallOptions() {
         GrpcCallOptions grpcCallOptions = new QueryOptions("test").grpcCallOptions();