diff --git build-common.xml build-common.xml
index a746966..be5f6dd 100644
--- build-common.xml
+++ build-common.xml
@@ -352,7 +352,7 @@
+ depends="clean-test,test-conditions,gen-test,compile-test,test-jar,test-init">
diff --git build.properties build.properties
index ffb3566..b52c511 100644
--- build.properties
+++ build.properties
@@ -21,6 +21,18 @@ hadoop.mirror2=http://archive.cloudera.com/hive-deps
build.dir.hive=${hive.root}/build
build.dir.hadoop=${build.dir.hive}/hadoopcore
+# All submodules
+build.modulelist.all=ant/build.xml,shims/build.xml,common/build.xml,serde/build.xml,metastore/build.xml,ql/build.xml,contrib/build.xml,service/build.xml,cli/build.xml,jdbc/build.xml,hwi/build.xml,hbase-handler/build.xml,ant/build.xml,pdk/build.xml,builtins/build.xml
+
+# Submodules with tests
+build.modulelist.test=shims/build.xml,common/build.xml,serde/build.xml,metastore/build.xml,cli/build.xml,pdk/build.xml,builtins/build.xml,ql/build.xml,hwi/build.xml,jdbc/build.xml,contrib/build.xml,service/build.xml,hbase-handler/build.xml
+
+# Submodules with Thrift IDL files
+build.modulelist.thrift=ql/build.xml,service/build.xml,metastore/build.xml,serde/build.xml
+
+# Submodules with CPP components
+build.modulelist.cpp=odbc/build.xml
+
hadoop.version.ant-internal=${hadoop.version}
hadoop.root.default=${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}
diff --git build.xml build.xml
index 047d432..c90704a 100644
--- build.xml
+++ build.xml
@@ -105,8 +105,7 @@
-
-
+
@@ -117,7 +116,7 @@
-
+
@@ -128,7 +127,7 @@
-
+
@@ -139,18 +138,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -233,17 +221,11 @@
-
-
-
-
-
-
@@ -260,7 +242,6 @@
-
-
+
@@ -293,23 +274,17 @@
depends="init"
description="Build JAR artifacts">
-
-
-
-
-
-
+
-
+
-
+
@@ -345,7 +320,7 @@
-
+
@@ -373,19 +348,6 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git common/build.xml common/build.xml
index 0d0665f..4ab7555 100755
--- common/build.xml
+++ common/build.xml
@@ -47,7 +47,7 @@ to call at top-level: ant deploy-contrib compile-core-test
+ depends="clean-test,test-conditions,gen-test,compile-test,test-jar,test-init">