diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8be6547175..501f83fc89 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1520,7 +1520,7 @@ jobs:
     steps:
       - name: Run YugabyteDB 2
         run: |
-          docker run -p 5433:5433 -e YSQL_USER=yugabyte -e YSQL_PASSWORD=yugabyte -d yugabytedb/yugabyte:2.21.0.0-b545 bin/yugabyted start --background=false --master_flag="ysql_enable_db_catalog_version_mode=false" --tserver_flags="ysql_enable_db_catalog_version_mode=false"
+          docker run -p 5433:5433 -e YSQL_USER=yugabyte -e YSQL_PASSWORD=yugabyte -d yugabytedb/yugabyte:2.20.4.0-b50 bin/yugabyted start --background=false --master_flag="ysql_enable_db_catalog_version_mode=false" --tserver_flags="ysql_enable_db_catalog_version_mode=false"
 
       - uses: actions/checkout@v4
 
diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultipleClusteringKeyScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultipleClusteringKeyScanIntegrationTest.java
index f62169f959..51041370cd 100644
--- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultipleClusteringKeyScanIntegrationTest.java
+++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultipleClusteringKeyScanIntegrationTest.java
@@ -7,8 +7,6 @@
 import com.scalar.db.io.DataType;
 import java.util.Properties;
 import java.util.Random;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 
 public class JdbcDatabaseMultipleClusteringKeyScanIntegrationTest
     extends DistributedStorageMultipleClusteringKeyScanIntegrationTestBase {
@@ -81,22 +79,4 @@ protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType)
     }
     return super.getColumnWithMaxValue(columnName, dataType);
   }
-
-  // TODO: Remove this once https://github.com/yugabyte/yugabyte-db/issues/22140 is fixed and the
-  //       fix is released.
-  @DisabledIf("isYugabyteDb")
-  @Test
-  @Override
-  public void scan_WithSecondClusteringKeyRange_ShouldReturnProperResult()
-      throws java.util.concurrent.ExecutionException, InterruptedException {
-    super.scan_WithSecondClusteringKeyRange_ShouldReturnProperResult();
-  }
-
-  @DisabledIf("isYugabyteDb")
-  @Test
-  @Override
-  public void scan_WithSecondClusteringKeyRangeWithSameValues_ShouldReturnProperResult()
-      throws java.util.concurrent.ExecutionException, InterruptedException {
-    super.scan_WithSecondClusteringKeyRangeWithSameValues_ShouldReturnProperResult();
-  }
 }