diff --git a/build.gradle b/build.gradle
index c6bf29735ce8..49fd5117e1ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -529,6 +529,9 @@ project(':iceberg-mr') {
     compileOnly("org.apache.hive:hive-metastore")
     compileOnly("org.apache.hive:hive-serde")
 
+    testCompile "org.apache.calcite:calcite-core"
+    testCompile "org.apache.calcite:calcite-druid"
+
     testCompile project(path: ':iceberg-data', configuration: 'testArtifacts')
     testCompile project(path: ':iceberg-api', configuration: 'testArtifacts')
     testCompile project(path: ':iceberg-core', configuration: 'testArtifacts')
diff --git a/versions.props b/versions.props
index 5e2251a218bb..96fb8541e419 100644
--- a/versions.props
+++ b/versions.props
@@ -1,9 +1,10 @@
 org.slf4j:* = 1.7.25
 org.apache.avro:avro = 1.9.2
+org.apache.calcite:* = 1.10.0
 org.apache.flink:* = 1.11.0
 org.apache.hadoop:* = 2.7.3
-org.apache.hive:hive-metastore = 2.3.7
-org.apache.hive:hive-serde = 2.3.7
+org.apache.hive:hive-metastore = 2.3.8
+org.apache.hive:hive-serde = 2.3.8
 org.apache.orc:* = 1.6.7
 org.apache.parquet:* = 1.11.1
 org.apache.spark:spark-hive_2.11 = 2.4.7
@@ -25,8 +26,8 @@ io.quarkus:* = 1.9.1.Final
 # test deps
 junit:junit = 4.12
 org.mockito:mockito-core = 1.10.19
-org.apache.hive:hive-exec = 2.3.7
-org.apache.hive:hive-service = 2.3.7
+org.apache.hive:hive-exec = 2.3.8
+org.apache.hive:hive-service = 2.3.8
 org.apache.tez:tez-dag = 0.8.4
 org.apache.tez:tez-mapreduce = 0.8.4
 com.adobe.testing:s3mock-junit4 = 2.1.28