diff --git a/build_image b/build_image
index 7d974ea..f926a5d 100755
--- a/build_image
+++ b/build_image
@@ -214,7 +214,7 @@
 move_image "${BUILD_DIR}" "${OUTPUT_DIR}"
 
 # Move DLC images to the output_root directory.
-build_dlc --sysroot="${BOARD_ROOT}" --install-root-dir="${OUTPUT_DIR}"
+build_dlc --sysroot="${BOARD_ROOT}" --install-root-dir="${OUTPUT_DIR}/dlc"
 
 # Create a named symlink.
 LINK_NAME="${FLAGS_output_root}/${BOARD}/${FLAGS_symlink}"
diff --git a/build_library/test_image_util.sh b/build_library/test_image_util.sh
index de8344c..0b5c1f0 100755
--- a/build_library/test_image_util.sh
+++ b/build_library/test_image_util.sh
@@ -42,6 +42,11 @@
 
   restore_fs_contexts "${BOARD_ROOT}" "${root_fs_dir}" "${stateful_fs_dir}"
 
+  # Move DLC images to the /var/cache directory. The dlc-images directory will
+  # hold DLC(s) that dlcservice will leverage for testing/provisioning.
+  sudo build_dlc --sysroot="${BOARD_ROOT}" \
+    --install-root-dir="${root_fs_dir}/var/cache/dlc-images"
+
   unmount_image
   trap - EXIT