diff --git a/assembly/pom.xml b/assembly/pom.xml
index cb66a14a48d02..a1a2048e5f003 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -189,11 +189,10 @@
       </dependencies>
     </profile>
     <profile>
-      <id>hive-0.13</id>
+      <id>hive-versions</id>
       <activation>
         <property>
           <name>hive.version</name>
-          <value>0.13.1</value>
         </property>
       </activation>
       <dependencies>
diff --git a/pom.xml b/pom.xml
index 94302f97b7951..d4650aff7b364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1246,17 +1246,15 @@
       </modules>
     </profile>
     <profile>
-      <id>hive-0.13</id>
+      <id>hive-versions</id>
       <activation>
         <property>
           <name>hive.version</name>
-          <value>0.13.1</value>
         </property>
       </activation>
       <properties>
         <derby.version>10.10.1.1</derby.version>
       </properties>
     </profile>
-
   </profiles>
 </project>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 67f0f46507070..35cccb9e5803d 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -132,7 +132,7 @@
                 </goals>
                 <configuration>
                   <sources>
-                    <source>v0.12/src/main/scala</source>
+                    <source>v${hive.version}/src/main/scala</source>
                   </sources>
                 </configuration>
               </execution>
@@ -168,11 +168,10 @@
       </build>
     </profile>
     <profile>
-      <id>hive-0.13</id>
+      <id>hive-versions</id>
       <activation>
         <property>
           <name>hive.version</name>
-          <value>0.13.1</value>
         </property>
       </activation>
       <dependencies>
@@ -222,7 +221,7 @@
                 </goals>
                 <configuration>
                   <sources>
-                    <source>v0.13/src/main/scala</source>
+                    <source>v${hive.version}/src/main/scala</source>
                   </sources>
                 </configuration>
               </execution>
diff --git a/sql/hive/v0.12/src/main/scala/org/apache/spark/sql/hive/Shim.scala b/sql/hive/v0.12.0/src/main/scala/org/apache/spark/sql/hive/Shim.scala
similarity index 100%
rename from sql/hive/v0.12/src/main/scala/org/apache/spark/sql/hive/Shim.scala
rename to sql/hive/v0.12.0/src/main/scala/org/apache/spark/sql/hive/Shim.scala
diff --git a/sql/hive/v0.13/src/main/scala/org/apache/spark/sql/hive/Shim.scala b/sql/hive/v0.13.1/src/main/scala/org/apache/spark/sql/hive/Shim.scala
similarity index 100%
rename from sql/hive/v0.13/src/main/scala/org/apache/spark/sql/hive/Shim.scala
rename to sql/hive/v0.13.1/src/main/scala/org/apache/spark/sql/hive/Shim.scala