diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 09db2ed5e4..5f2a083ad5 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -69,6 +69,5 @@
 ./test/cmd/template-output.sh
 ./test/cmd/version.sh
 ./test/e2e_node/conformance/run_test.sh
-./test/e2e_node/environment/setup_host.sh
 ./test/e2e_node/gubernator.sh
 ./test/images/image-util.sh
diff --git a/test/e2e_node/environment/setup_host.sh b/test/e2e_node/environment/setup_host.sh
index d5bb518117..a427f70f94 100755
--- a/test/e2e_node/environment/setup_host.sh
+++ b/test/e2e_node/environment/setup_host.sh
@@ -42,38 +42,35 @@ EOF
 fi
 
 # For coreos, disable updates
-if $(sudo systemctl status update-engine &>/dev/null); then
+if sudo systemctl status update-engine &>/dev/null; then
   sudo systemctl mask update-engine locksmithd
 fi
 
 # Fixup sudoers require tty
-sudo grep -q "# Defaults    requiretty" /etc/sudoers
-if [ $? -ne 0 ] ; then
+if ! sudo grep -q "# Defaults    requiretty" /etc/sudoers; then
   sudo sed -i 's/Defaults    requiretty/# Defaults    requiretty/' /etc/sudoers
 fi
 
 # Install nsenter for ubuntu images
-cat /etc/*-release | grep "ID=ubuntu"
-if [ $? -eq 0 ]; then
+if cat /etc/*-release | grep "ID=ubuntu"; then
   if ! which nsenter > /dev/null; then
      echo "Do not find nsenter. Install it."
      NSENTER_BUILD_DIR=$(mktemp -d /tmp/nsenter-build-XXXXXX)
-     cd $NSENTER_BUILD_DIR
+     cd "$NSENTER_BUILD_DIR" || exit 1
      curl https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-2.31.tar.gz | tar -zxf-
      sudo apt-get update
      sudo apt-get --yes install make
      sudo apt-get --yes install gcc
-     cd util-linux-2.31
+     cd util-linux-2.31 || exit 1
      ./configure --without-ncurses
      make nsenter
      sudo cp nsenter /usr/local/bin
-     rm -rf $NSENTER_BUILD_DIR
+     rm -rf "$NSENTER_BUILD_DIR"
    fi
 fi
 
 # Install docker
-hash docker 2>/dev/null
-if [ $? -ne 0 ]; then
+if ! hash docker 2>/dev/null; then
   # RHEL platforms should always install from RHEL repository
   # This will install the latest supported stable docker platform on RHEL
   if [ $OS_RHEL -eq 0 ]; then
@@ -93,8 +90,7 @@ id jenkins || sudo useradd jenkins -m
 sudo usermod -a -G docker jenkins
 
 # install lxc
-cat /etc/*-release | grep "ID=debian"
-if [ $? -ne 0 ]; then
+if ! cat /etc/*-release | grep "ID=debian"; then
   hash apt-get 2>/dev/null
   if [ $? -ne 1 ]; then
     sudo apt-get install lxc -y