diff --git a/.gitignore b/.gitignore
index f910d3b..b57b99d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,11 +61,8 @@ ChangeLog
 releasenotes/build
 
 # Test temp files
-tests/plugins
 tests/common
 tests/*.retry
 
 # Vagrant artifacts
 .vagrant
-
-
diff --git a/Vagrantfile b/Vagrantfile
index 40fe913..33cb23f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,8 +1,31 @@
-Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/xenial64"
-  config.vm.provision "shell", inline: <<-SHELL
-    sudo su -
-    cd /vagrant
-    ./run_tests.sh
-  SHELL
+# 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.provider "virtualbox" do |v|
+    v.memory = 2048
+    v.cpus = 2
+  end
+
+  config.vm.provision "shell",
+      privileged: false,
+      inline: <<-SHELL
+          cd /vagrant
+         ./run_tests.sh
+      SHELL
+
+  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 70b72b1..cc2aca5 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -23,7 +23,7 @@
 #
 
 # Base requirements for Ubuntu
-build-essential   [platform:dpkg]
+gcc               [platform:dpkg]
 git-core          [platform:dpkg]
 libssl-dev        [platform:dpkg]
 libffi-dev        [platform:dpkg]
diff --git a/run_tests.sh b/run_tests.sh
index 44b0404..8f87c45 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -12,54 +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 -xeuo pipefail
+## 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 with pip.
-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
 
-# Get a list of packages to install with bindep. If packages need to be
-# installed, bindep exits with an exit code of 1.
-BINDEP_PKGS=$(bindep -b -f bindep.txt test || true)
-echo "Packages to install: ${BINDEP_PKGS}"
+install_pkg_deps() {
+    pkg_deps="git"
 
-# Install a list of OS packages provided by bindep.
-if which apt-get; then
-    sudo apt-get update
-    DEBIAN_FRONTEND=noninteractive \
-      sudo apt-get -q --option "Dpkg::Options::=--force-confold" \
-      --assume-yes install $BINDEP_PKGS
-elif which yum; then
-    # Don't run yum with an empty list of packages.
-    # It will fail and cause the script to exit with an error.
-    if [[ ${#BINDEP_PKGS} > 0 ]]; then
-      sudo yum install -y $BINDEP_PKGS
+    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
+}
+
+install_pkg_deps
+
+git_clone_repo
+
+# start executing the main test script
+source tests/common/run_tests_common.sh
 
-# Loop through each tox environment and run tests.
-for tox_env in $(awk -F= '/envlist/ { gsub(",", " "); print $2 }' tox.ini); do
-  echo "Executing tox environment: ${tox_env}"
-  if [[ ${tox_env} == ansible-functional ]]; then
-    if ${FUNCTIONAL_TEST}; then
-      tox -e ${tox_env}
-    fi
-  else
-    tox -e ${tox_env}
-  fi
-done