diff --git a/build_image.sh b/build_image.sh
index 223567d746..8a926e4286 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -17,8 +17,8 @@
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
-# Script must be run inside the chroot
 assert_inside_chroot
+assert_not_root_user
 
 DEFAULT_PKGLIST="${SRC_ROOT}/package_repo/package-list-prod.txt"
 
diff --git a/build_platform_packages.sh b/build_platform_packages.sh
index 2e8a9e7708..845c125fea 100755
--- a/build_platform_packages.sh
+++ b/build_platform_packages.sh
@@ -8,8 +8,8 @@
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
-# Script must be run inside the chroot
 assert_inside_chroot
+assert_not_root_user
 
 # Flags
 DEFINE_boolean stable $FLAGS_FALSE "Build with stable version of browser."
diff --git a/build_tests.sh b/build_tests.sh
index f4da0a2831..a057b60e67 100755
--- a/build_tests.sh
+++ b/build_tests.sh
@@ -8,6 +8,9 @@
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
+assert_inside_chroot
+assert_not_root_user
+
 # Flags
 
 # Parse command line