diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index bc3c032c9c..d87e93ac72 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -24,5 +24,5 @@ pushd "${KOLLA_ANSIBLE_DIR}"
 sudo cp -a etc/kolla /etc/
 # Generate passwords
 sudo tools/generate_passwords.py
-./tools/deploy_aio.sh "$KOLLA_BASE" "$KOLLA_TYPE"
+sudo ./tools/deploy_aio.sh "$KOLLA_BASE" "$KOLLA_TYPE"
 popd
diff --git a/tox.ini b/tox.ini
index 7dec61e514..fc032ff948 100644
--- a/tox.ini
+++ b/tox.ini
@@ -145,53 +145,49 @@ commands =
 [testenv:deploy-centos-binary]
 whitelist_externals = find
                       bash
-                      sudo
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestCentosBinary
-  sudo {toxinidir}/tools/deploy_aio.sh centos binary
+  {toxinidir}/tools/deploy_aio.sh centos binary
   {toxinidir}/tools/dump_info.sh
 
 [testenv:deploy-centos-source]
 whitelist_externals = find
                       bash
-                      sudo
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestCentosSource
-  sudo {toxinidir}/tools/deploy_aio.sh centos source
+  {toxinidir}/tools/deploy_aio.sh centos source
   {toxinidir}/tools/dump_info.sh
 
 [testenv:deploy-oraclelinux-binary]
 whitelist_externals = find
                       bash
-                      sudo
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestOracleLinuxBinary
-  sudo {toxinidir}/tools/deploy_aio.sh oraclelinux binary
+  {toxinidir}/tools/deploy_aio.sh oraclelinux binary
   {toxinidir}/tools/dump_info.sh
 
 [testenv:deploy-oraclelinux-source]
 whitelist_externals = find
                       bash
-                      sudo
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestOracleLinuxSource
-  sudo {toxinidir}/tools/deploy_aio.sh oraclelinux source
+  {toxinidir}/tools/deploy_aio.sh oraclelinux source
   {toxinidir}/tools/dump_info.sh
 
 [testenv:deploy-ubuntu-binary]
@@ -203,20 +199,19 @@ commands =
   find . -type f -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestUbuntuBinary
-  sudo {toxinidir}/tools/deploy_aio.sh ubuntu binary
+  {toxinidir}/tools/deploy_aio.sh ubuntu binary
   {toxinidir}/tools/dump_info.sh
 
 [testenv:deploy-ubuntu-source]
 whitelist_externals = find
                       bash
-                      sudo
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestUbuntuSource
-  sudo {toxinidir}/tools/deploy_aio.sh ubuntu source
+  {toxinidir}/tools/deploy_aio.sh ubuntu source
   {toxinidir}/tools/dump_info.sh
 
 [testenv:deploy-multinode-ubuntu-source]