diff --git a/dockerfiles/build.include b/dockerfiles/build.include
index c8fccc8d7d..1d045ed0c0 100755
--- a/dockerfiles/build.include
+++ b/dockerfiles/build.include
@@ -10,6 +10,7 @@ set -e
 set -u
 
 IMAGE_ALIASES=${IMAGE_ALIASES:-}
+ERROR=${ERROR:-}
 
 skip_tests() {
   if [ $SKIP_TESTS = "true" ]; then
diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh
index 2159c35556..62c8509b9c 100755
--- a/dockerfiles/build.sh
+++ b/dockerfiles/build.sh
@@ -34,7 +34,7 @@ build_directory() {
   shift
   # Calling build.sh
   if [ -e ${directory}/build.sh ] ; then
-    ${directory}build.sh ${OPTIONS} ${ARGS}
+    bash ${directory}build.sh ${OPTIONS} ${ARGS}
   else
     printf "${RED}No build.sh in directory ${directory}${NC}\n"
     exit 2
diff --git a/dockerfiles/cli/.require b/dockerfiles/cli/.require
index e1d71e5789..82ae8bdc3a 100644
--- a/dockerfiles/cli/.require
+++ b/dockerfiles/cli/.require
@@ -1,2 +1,4 @@
 base
 bats
+che
+init