diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh
index 5bc1b2fbb0..69f68e2c84 100755
--- a/mod_image_for_test.sh
+++ b/mod_image_for_test.sh
@@ -13,6 +13,11 @@
 # Load functions and constants for chromeos-install
 . "$(dirname "$0")/chromeos-common.sh"
 
+if [ ${INSIDE_CHROOT} -eq 0 ] ; then
+  "$(dirname "$0")/enter_chroot.sh" ./mod_image_for_test.sh "$@"
+  exit 0
+fi
+
 get_default_board
 
 DEFINE_string board "$DEFAULT_BOARD" "Board for which the image was built"