diff --git a/.github/workflows/RavenClient.yml b/.github/workflows/RavenClient.yml
index 1ec3ef99..48bea1a0 100644
--- a/.github/workflows/RavenClient.yml
+++ b/.github/workflows/RavenClient.yml
@@ -22,7 +22,7 @@ jobs:
     
     strategy:
       matrix:
-        java-version: [8, 11, 14, 16, 17]
+        java-version: [8, 11, 14, 16, 17, 21]
         serverVersion: ["5.4", "6.0"]
       fail-fast: false
 
diff --git a/src/test/java/net/ravendb/client/test/client/RevisionsTest.java b/src/test/java/net/ravendb/client/test/client/RevisionsTest.java
index caa6ecc9..47b523ab 100644
--- a/src/test/java/net/ravendb/client/test/client/RevisionsTest.java
+++ b/src/test/java/net/ravendb/client/test/client/RevisionsTest.java
@@ -99,7 +99,7 @@ public void canListRevisionsBin() throws Exception {
                 session.saveChanges();
             }
 
-            GetRevisionsBinEntryCommand revisionsBinEntryCommand = new GetRevisionsBinEntryCommand(Long.MAX_VALUE, 20);
+            GetRevisionsBinEntryCommand revisionsBinEntryCommand = new GetRevisionsBinEntryCommand(0, 20);
             store.getRequestExecutor().execute(revisionsBinEntryCommand);
 
             JsonArrayResult result = revisionsBinEntryCommand.getResult();
diff --git a/src/test/java/net/ravendb/client/test/issues/RavenDB_16060Test.java b/src/test/java/net/ravendb/client/test/issues/RavenDB_16060Test.java
index ae952846..dae77535 100644
--- a/src/test/java/net/ravendb/client/test/issues/RavenDB_16060Test.java
+++ b/src/test/java/net/ravendb/client/test/issues/RavenDB_16060Test.java
@@ -546,7 +546,7 @@ public void canServeTimeSeriesFromCache_Rollup() throws Exception {
                 session.saveChanges();
             }
 
-            Thread.sleep(1200); // wait for rollups
+            Thread.sleep(3000); // wait for rollups
 
             try (IDocumentSession session = store.openSession()) {
                 ISessionDocumentRollupTypedTimeSeries<TimeSeriesTypedSessionTest.StockPrice> ts =
@@ -608,7 +608,7 @@ public void canIncludeTypedTimeSeries_Rollup() throws Exception {
                 session.saveChanges();
             }
 
-            Thread.sleep(1200); // wait for rollups
+            Thread.sleep(3000); // wait for rollups
 
             try (IDocumentSession session = store.openSession()) {
                 User user = session.query(User.class)