diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh
index 1fb1aea315..5a45dcefea 100755
--- a/scripts/bootstrap-aio.sh
+++ b/scripts/bootstrap-aio.sh
@@ -46,16 +46,13 @@ export GROUP_VARS_PATH="/dev/null"
 
 # Run AIO bootstrap playbook
 pushd tests
-  if [ -z "${BOOTSTRAP_OPTS}" ]; then
-    /usr/local/bin/ansible-playbook bootstrap-aio.yml
-  else
-    export BOOTSTRAP_OPTS_ITEMS=''
-    for BOOTSTRAP_OPT in ${BOOTSTRAP_OPTS}; do
-      BOOTSTRAP_OPTS_ITEMS=${BOOTSTRAP_OPTS_ITEMS}"-e "${BOOTSTRAP_OPT}" "
-    done
-    /usr/local/bin/ansible-playbook bootstrap-aio.yml \
-                                    ${BOOTSTRAP_OPTS_ITEMS}
-  fi
+export BOOTSTRAP_OPTS_ITEMS=''
+for BOOTSTRAP_OPT in ${BOOTSTRAP_OPTS}; do
+    BOOTSTRAP_OPTS_ITEMS=${BOOTSTRAP_OPTS_ITEMS}"-e "${BOOTSTRAP_OPT}" "
+done
+/usr/local/bin/ansible-playbook bootstrap-aio.yml \
+                                ${BOOTSTRAP_OPTS_ITEMS} \
+                                ${BOOTSTRAP_EXTRA_PARAMS:-}
 popd
 
 # Now unset the env var overrides so that the defaults work again