diff --git a/.gitignore b/.gitignore
index 70fc3b78..b57b99d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,10 +61,8 @@ ChangeLog
 releasenotes/build
 
 # Test temp files
-tests/*.retry
 tests/common
+tests/*.retry
 
 # Vagrant artifacts
 .vagrant
-
-
diff --git a/Vagrantfile b/Vagrantfile
index 54f0e352..745cc718 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,12 +1,36 @@
+# Verify whether required plugins are installed.
+required_plugins = [ "vagrant-disksize" ]
+required_plugins.each do |plugin|
+  if not Vagrant.has_plugin?(plugin)
+    raise "The vagrant plugin #{plugin} is required. Please run `vagrant plugin install #{plugin}`"
+  end
+end
+
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/trusty64"
   config.vm.provider "virtualbox" do |v|
     v.memory = 2048
     v.cpus = 2
   end
-  config.vm.provision "shell", inline: <<-SHELL
-    sudo su -
-    cd /vagrant
-    ./run_tests.sh
-  SHELL
+
+  config.vm.provision "shell",
+      privileged: false,
+      inline: <<-SHELL
+          cd /vagrant
+         ./run_tests.sh
+      SHELL
+
+  config.vm.define "ubuntu1404" do |trusty|
+    trusty.disksize.size = "40GB"
+    trusty.vm.box = "ubuntu/trusty64"
+  end
+
+  config.vm.define "ubuntu1604" do |xenial|
+    xenial.disksize.size = "40GB"
+    xenial.vm.box = "ubuntu/xenial64"
+  end
+
+  config.vm.define "centos7" do |centos7|
+    centos7.vm.box = "centos/7"
+  end
+
 end
diff --git a/bindep.txt b/bindep.txt
index 59ab45d0..37244a6d 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -9,6 +9,18 @@
 # is better to have this file empty, otherwise OpenStack-CI
 # will fall back to installing its default packages which
 # will potentially be detrimental to the tests executed.
+#
+# Note:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/bindep.txt
+# If you need to remove or add extra dependencies, you should modify
+# the central file instead and once your change is accepted then update
+# this file as well. The purpose of this file is to ensure that Python and
+# Ansible have all their necessary binary requirements on the test host before
+# tox executes. Any binary requirements needed by services/roles should be
+# installed by those roles in their applicable package install tasks, not through
+# using this file.
+#
 
 # Base requirements for Ubuntu
 build-essential   [platform:dpkg]
diff --git a/run_tests.sh b/run_tests.sh
index 482a3894..8f87c457 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -12,44 +12,57 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
+# Note:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/run_tests.sh
+# If you need to modify this file, update the one in the openstack-ansible-tests
+# repository and then update this file as well. The purpose of this file is to
+# prepare the host and then execute all the tox tests.
+#
 
-set -euov
+## Shell Opts ----------------------------------------------------------------
+set -xeu
 
-FUNCTIONAL_TEST=${FUNCTIONAL_TEST:-true}
+## Vars ----------------------------------------------------------------------
 
-# Install pip
-if [ ! "$(which pip)" ]; then
-  curl --silent --show-error --retry 5 \
-    https://bootstrap.pypa.io/get-pip.py | sudo python2.7
-fi
+export WORKING_DIR=${WORKING_DIR:-$(pwd)}
 
-# Install bindep and tox
-sudo pip install bindep tox
+## Main ----------------------------------------------------------------------
 
-# CentOS 7 requires two additional packages:
-#   redhat-lsb-core - for bindep profile support
-#   epel-release    - required to install python-ndg_httpsclient/python2-pyasn1
-if [ "$(which yum)" ]; then
-    sudo yum -y install redhat-lsb-core epel-release
-fi
+source /etc/os-release || source /usr/lib/os-release
 
-# Install OS packages using bindep
-if apt-get -v >/dev/null 2>&1 ; then
-    sudo apt-get update
-    DEBIAN_FRONTEND=noninteractive \
-      sudo apt-get -q --option "Dpkg::Options::=--force-confold" \
-      --assume-yes install `bindep -b -f bindep.txt test`
-else
-    sudo yum install -y `bindep -b -f bindep.txt test`
-fi
+install_pkg_deps() {
+    pkg_deps="git"
 
-# run through each tox env and execute the test
-for tox_env in $(awk -F= '/envlist/ {print $2}' tox.ini | sed 's/,/ /g'); do
-  if [ "${tox_env}" != "ansible-functional" ]; then
-    tox -e ${tox_env}
-  elif [ "${tox_env}" == "ansible-functional" ]; then
-    if ${FUNCTIONAL_TEST}; then
-      tox -e ${tox_env}
+    case ${ID,,} in
+        centos|rhel) pkg_mgr_cmd="yum install -y" ;;
+        fedora) pkg_mgr_cmd="dnf -y install" ;;
+        ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
+        *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
+    esac
+
+    eval sudo $pkg_mgr_cmd $pkg_deps
+}
+
+git_clone_repo() {
+    if [[ ! -d tests/common ]]; then
+        # The tests repo doesn't need a clone, we can just
+        # symlink it.
+        if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
+            ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
+        else
+            git clone -b stable/ocata \
+                https://git.openstack.org/openstack/openstack-ansible-tests \
+                tests/common
+        fi
     fi
-  fi
-done
+}
+
+install_pkg_deps
+
+git_clone_repo
+
+# start executing the main test script
+source tests/common/run_tests_common.sh
+