diff --git a/hudi-client/pom.xml b/hudi-client/pom.xml
index d350777cf..9516f4906 100644
--- a/hudi-client/pom.xml
+++ b/hudi-client/pom.xml
@@ -231,6 +231,13 @@
       <artifactId>hive-exec</artifactId>
       <version>${hive.version}</version>
       <scope>test</scope>
+      <classifier>${hive.exec.classifier}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${hive.groupid}</groupId>
+      <artifactId>hive-metastore</artifactId>
+      <version>${hive.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/hudi-hadoop-mr/pom.xml b/hudi-hadoop-mr/pom.xml
index 6bc3c8e42..525aa0aae 100644
--- a/hudi-hadoop-mr/pom.xml
+++ b/hudi-hadoop-mr/pom.xml
@@ -79,6 +79,7 @@
     <dependency>
       <groupId>${hive.groupid}</groupId>
       <artifactId>hive-exec</artifactId>
+      <classifier>${hive.exec.classifier}</classifier>
     </dependency>
 
     <!-- Hoodie - Test -->
diff --git a/hudi-utilities/pom.xml b/hudi-utilities/pom.xml
index ba59e224c..4c88eb05d 100644
--- a/hudi-utilities/pom.xml
+++ b/hudi-utilities/pom.xml
@@ -329,6 +329,7 @@
       <artifactId>hive-exec</artifactId>
       <version>${hive.version}</version>
       <scope>test</scope>
+      <classifier>${hive.exec.classifier}</classifier>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index ab99498ff..36401fabb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
     <hadoop.version>2.7.3</hadoop.version>
     <hive.groupid>org.apache.hive</hive.groupid>
     <hive.version>2.3.1</hive.version>
+    <hive.exec.classifier>core</hive.exec.classifier>
     <metrics.version>4.1.1</metrics.version>
     <spark.version>2.1.0</spark.version>
     <avro.version>1.7.7</avro.version>
@@ -783,6 +784,7 @@
         <artifactId>hive-exec</artifactId>
         <version>${hive.version}</version>
         <scope>provided</scope>
+        <classifier>${hive.exec.classifier}</classifier>
         <exclusions>
           <exclusion>
             <groupId>javax.mail</groupId>