diff --git a/BUILD/install_build_deps.sh b/BUILD/install_build_deps.sh
index 4fbe90b52..5b1328e60 100755
--- a/BUILD/install_build_deps.sh
+++ b/BUILD/install_build_deps.sh
@@ -65,34 +65,34 @@ then
   sudo apt-get update
 
   sudo dpkg-reconfigure libc6
-  sudo -E apt-get -q -o Dpkg::Options::=--force-confold \
+  apt_cmd="sudo -E apt-get -q -o Dpkg::Options::=--force-confold \
        -o Dpkg::Options::=--force-confdef \
-       -y --force-yes \
-       install dpkg-dev git wget \
+       -y --force-yes"
+  ${apt_cmd} install dpkg-dev git wget \
        build-essential libssl-dev ncurses-dev bison flex \
        perl libtool libpcre3-dev tcl tcl-dev uuid \
        uuid-dev libsqlite3-dev liblzma-dev libpam0g-dev pkg-config \
        libedit-dev
 
   # One of these will work, older systems use libsystemd-daemon-dev
-  sudo apt-get install -y libsystemd-dev || \
-      sudo apt-get install -y libsystemd-daemon-dev
+  ${apt_cmd} install libsystemd-dev || \
+      ${apt_cmd} install libsystemd-daemon-dev
 
-  ## separatelibgnutls installation process for Ubuntu Trusty
+   ## separate libgnutls installation process for Ubuntu Trusty
   cat /etc/*release | grep -E "Trusty|wheezy"
   if [ $? == 0 ]
   then
-     sudo apt-get install -y --force-yes libgnutls-dev libgcrypt11-dev
+     ${apt_cmd} install libgnutls-dev libgcrypt11-dev
   else
-     sudo apt-get install -y --force-yes libgnutls30 libgnutls-dev
+     ${apt_cmd} install libgnutls30 libgnutls-dev
      if [ $? != 0 ]
      then
-         sudo apt-get install -y --force-yes libgnutls28-dev
+         ${apt_cmd} install libgnutls28-dev
      fi
-     sudo apt-get install -y --force-yes libgcrypt20-dev
+     ${apt_cmd} install libgcrypt20-dev
      if [ $? != 0 ]
      then
-         sudo apt-get install -y --force-yes libgcrypt11-dev
+         ${apt_cmd} install libgcrypt11-dev
      fi
   fi
 fi
diff --git a/BUILD/install_test_build_deps.sh b/BUILD/install_test_build_deps.sh
index b955476da..2d84e0591 100755
--- a/BUILD/install_test_build_deps.sh
+++ b/BUILD/install_test_build_deps.sh
@@ -17,38 +17,38 @@ then
   sudo cp mariadb.list /etc/apt/sources.list.d/
   sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0xF1656F24C74CD1D8
   export DEBIAN_FRONTEND=noninteractive
-  sudo apt-get update
-  apt_opt="sudo -E apt-get -q -o Dpkg::Options::=--force-confold \
+  apt_cmd="sudo -E apt-get -q -o Dpkg::Options::=--force-confold \
        -o Dpkg::Options::=--force-confdef \
        -y --force-yes"
-  ${apt_opt} install \
+  ${apt_cmd} update
+  ${apt_cmd} install \
        git wget build-essential \
        libssl-dev mariadb-client php perl \
        coreutils libjansson-dev zlib1g-dev \
        mariadb-test python python-pip cmake libpam0g-dev
-## separatelibgnutls installation process for Ubuntu Trusty
+  ## separate libgnutls installation process for Ubuntu Trusty
   cat /etc/*release | grep -E "Trusty|wheezy"
   if [ $? == 0 ]
   then
-     ${apt_opt} install libgnutls-dev libgcrypt11-dev
+     ${apt_cmd} install libgnutls-dev libgcrypt11-dev
   else
-     ${apt_opt} install libgnutls30 libgnutls-dev
+     ${apt_cmd} install libgnutls30 libgnutls-dev
      if [ $? != 0 ]
      then
-         ${apt_opt} install libgnutls28-dev
+         ${apt_cmd} install libgnutls28-dev
      fi
-     ${apt_opt} install libgcrypt20-dev
+     ${apt_cmd} install libgcrypt20-dev
      if [ $? != 0 ]
      then
-         ${apt_opt} install libgcrypt11-dev
+         ${apt_cmd} install libgcrypt11-dev
      fi
   fi
 
-  ${apt_opt} install openjdk-8-jdk
-  ${apt_opt} install php-mysql
+  ${apt_cmd} install openjdk-8-jdk
+  ${apt_cmd} install php-mysql
   if [ $? != 0 ]
   then
-      ${apt_opt} install openjdk-7-jdk
+      ${apt_cmd} install openjdk-7-jdk
   fi
   pip install --upgrade pip
   pip install JayDeBeApi