diff --git a/build_library/test_image_util.sh b/build_library/test_image_util.sh
index 9f6729f9ad..4173451140 100755
--- a/build_library/test_image_util.sh
+++ b/build_library/test_image_util.sh
@@ -127,7 +127,8 @@ mod_image_for_test () {
     emerge_to_image --root="${ROOT_FS_DIR}" factorytest-init
     INSTALL_MASK="${FACTORY_TEST_INSTALL_MASK}"
     emerge_to_image --root="${ROOT_FS_DIR}/usr/local" \
-      chromeos-base/autotest chromeos-base/autotest-all
+      chromeos-base/autotest chromeos-base/autotest-all \
+      chromeos-base/chromeos-factory
     prepare_hwid_for_factory "${BUILD_DIR}"
 
     local mod_factory_script
diff --git a/build_packages b/build_packages
index 9efcf289f5..d55ac92701 100755
--- a/build_packages
+++ b/build_packages
@@ -152,6 +152,7 @@ if [[ "${FLAGS_withdev}" -eq "${FLAGS_TRUE}" ]]; then
   PACKAGES="${PACKAGES} chromeos-base/chromeos-dev"
 fi
 if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then
+  PACKAGES="${PACKAGES} chromeos-base/chromeos-factory"
   PACKAGES="${PACKAGES} chromeos-base/chromeos-factoryinstall"
   PACKAGES="${PACKAGES} chromeos-base/factorytest-init"
   PACKAGES="${PACKAGES} chromeos-base/chromeos-hwid"