diff --git a/build_image b/build_image
index fc3d9debdc..52bf3a8f0c 100755
--- a/build_image
+++ b/build_image
@@ -105,8 +105,6 @@ for arg in "$@"; do
   esac
 done
 
-eclean-$BOARD -d packages
-
 # Check that the build root is sane.
 if [[ ${skip_test_build_root} -ne 1 ]]; then
   info "Checking build root"
diff --git a/build_packages b/build_packages
index 518f97fc84..c40c4ef6e7 100755
--- a/build_packages
+++ b/build_packages
@@ -243,6 +243,8 @@ if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then
   fi
 fi
 
+eclean-$BOARD -d packages
+
 info "Checking build root"
 test_image_content "${BOARD_ROOT}"