diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddfc26b1b9..875cfb109f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -448,6 +448,17 @@ add_custom_target(cscope ALL DEPENDS gen-deps
   COMMAND "${CMAKE_SOURCE_DIR}/bin/gen-cscope.sh"
 )
 
+add_custom_target(notests_independent_targets DEPENDS
+  java cscope tarballs
+)
+add_custom_target(notests_regular_targets DEPENDS
+  impalad statestored catalogd fesupport loggingsupport ImpalaUdf udasample udfsample
+)
+
+add_custom_target(notests_all_targets DEPENDS
+  notests_independent_targets notests_regular_targets
+)
+
 # Dump include paths to a file
 if (DUMP_INCLUDE_PATHS)
   file(REMOVE "${DUMP_INCLUDE_PATHS}")
diff --git a/buildall.sh b/buildall.sh
index 2a7eade581..29fd0fdb76 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -445,11 +445,10 @@ build_all_components() {
   # If we skip specifying targets, everything we need gets built.
   local MAKE_TARGETS=""
   if [[ $BUILD_TESTS -eq 0 ]]; then
-    # Specify all the non-test targets
-    MAKE_TARGETS="impalad statestored catalogd fesupport loggingsupport ImpalaUdf \
-        udasample udfsample"
     if (( build_independent_targets )); then
-      MAKE_TARGETS+=" cscope java tarballs"
+      MAKE_TARGETS="notests_all_targets"
+    else
+      MAKE_TARGETS="notests_regular_targets"
     fi
   fi
   ${MAKE_CMD} -j${IMPALA_BUILD_THREADS:-4} ${IMPALA_MAKE_FLAGS} ${MAKE_TARGETS}