diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh
index fd9b8edd16..8c660e5c1e 100755
--- a/scripts/bootstrap-aio.sh
+++ b/scripts/bootstrap-aio.sh
@@ -276,8 +276,7 @@ sed -i "s/external_lb_vip_address:.*/external_lb_vip_address: ${PUBLIC_ADDRESS}/
 
 # Change affinities (number of containers per host) if the appropriate
 # environment variables are set.
-for container_type in keystone galera rabbit_mq horizon repo
-do
+for container_type in keystone galera rabbit_mq horizon repo; do
   var_name="NUM_${container_type}_CONTAINER"
   set +u
   num=${!var_name}
@@ -296,8 +295,7 @@ if [ ${DEPLOY_CEILOMETER} == "yes" ]; then
   service mongodb restart
 
   # Wait for mongodb to restart
-  for i in {1..12}
-  do
+  for i in {1..12}; do
     mongo --host $MONGO_HOST --eval ' ' && break
     sleep 5
   done
diff --git a/scripts/federated-login.sh b/scripts/federated-login.sh
index 541053a4d6..9cbd9edf51 100755
--- a/scripts/federated-login.sh
+++ b/scripts/federated-login.sh
@@ -29,8 +29,7 @@ usage()
 }
 
 
-while [[ $# > 0 ]]
-do
+while [[ $# > 0 ]]; do
     key="$1"
     case $key in
         -d|--domain)
diff --git a/scripts/sources-branch-updater.sh b/scripts/sources-branch-updater.sh
index 65f6399ff9..0b2982f981 100755
--- a/scripts/sources-branch-updater.sh
+++ b/scripts/sources-branch-updater.sh
@@ -33,8 +33,7 @@ exit 0
 fi
 
 # Provide some CLI options
-while [[ $# > 1 ]]
-do
+while [[ $# > 1 ]]; do
 key="$1"
 case $key in
     -b|--branch)
diff --git a/scripts/update-revision.sh b/scripts/update-revision.sh
index fc8c65ecb8..53a31e044e 100644
--- a/scripts/update-revision.sh
+++ b/scripts/update-revision.sh
@@ -27,8 +27,7 @@ exit 0
 fi
 
 # Provide some CLI options
-while [[ $# > 1 ]]
-do
+while [[ $# > 1 ]]; do
 key="$1"
 case $key in
     -r|--revision)
diff --git a/tox.ini b/tox.ini
index 71902de22e..4ef5530f48 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,4 +28,4 @@ commands =
   bash -c "find {toxinidir}     \
             -not -path '*/\.*'  \ # stay out of the dot directories
             -name '*sh'         \ # all shell scripts please
-            -print0 | xargs -0 bashate -v -i E003,E010,E011"
+            -print0 | xargs -0 bashate -v -i E003,E011"