diff --git a/playbooks/defaults/distro_install.yml b/playbooks/defaults/distro_install.yml
index 64fa3c5fca..12d89175e0 100644
--- a/playbooks/defaults/distro_install.yml
+++ b/playbooks/defaults/distro_install.yml
@@ -59,8 +59,6 @@ sahara_install_method: distro
 searchlight_install_method: distro
 swift_install_method: distro
 tacker_install_method: distro
-tempest_install_method: distro
-tempest_bin: /usr/bin
 trove_install_method: distro
 watcher_install_method: distro
 zaqar_install_method: distro
@@ -68,5 +66,3 @@ zun_install_method: distro
 
 # default variables for PIP since we are not using the repo server
 pip_default_index: "https://pypi.python.org/simple"
-
-tempest_venv_download: false
diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml
index 1cf6ba09d7..033b4eb3fb 100644
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@@ -18,7 +18,12 @@
   gather_facts: "{{ osa_gather_facts | default(True) }}"
   user: root
   vars_files:
-    - "defaults/{{ install_method }}_install.yml"
+    - defaults/repo_packages/openstack_services.yml
+    - defaults/source_install.yml
+  vars:
+    tempest_venv_download: "{{ install_method == 'source' }}"
+  pre_tasks:
+    - import_tasks: common-tasks/set-pip-vars.yml
   roles:
     - role: "os_tempest"
     - role: "system_crontab_coordination"