diff --git a/etc/openstack_deploy/user_group_vars.yml b/etc/openstack_deploy/user_group_vars.yml
index a930962d99..97afd2151f 100644
--- a/etc/openstack_deploy/user_group_vars.yml
+++ b/etc/openstack_deploy/user_group_vars.yml
@@ -157,3 +157,13 @@ heat_service_region: "{{ service_region }}"
 openrc_os_auth_url: "{{ keystone_service_internalurl }}"
 openrc_os_password: "{{ keystone_auth_admin_password }}"
 
+
+## Tempest Options
+tempest_pip_instructions: >
+  --isolated
+  --pre
+  --allow-all-external
+  --index-url {{ repo_pip_default_index }}
+  --extra-index-url https://pypi.python.org/simple
+  --trusted-host pypi.python.org
+  --trusted-host {{ openstack_upstream_domain }}
diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml
index ae872e9268..f5802bd01d 100644
--- a/playbooks/defaults/repo_packages/openstack_other.yml
+++ b/playbooks/defaults/repo_packages/openstack_other.yml
@@ -39,8 +39,10 @@ requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | r
 ## Tempest Library
 tempestlib_git_repo: https://github.com/openstack/tempest-lib
 tempestlib_git_install_branch: 061a2efc71ccce9024f86517edccdb4c82d416bc # HEAD of "master" as of 22.06.2015
+tempestlib_git_install_fragments: "yaprtignorerequirements=true"
 tempestlib_git_dest: "/opt/tempest-lib_{{ requirements_git_install_branch | replace('/', '_') }}"
 
+
 ## Cryptography
 # NOTE(sigmavirus24): Fix this when cryptography 1.0 is released and
 # global-requirements.txt allows for it. See also:
diff --git a/playbooks/roles/os_tempest/defaults/main.yml b/playbooks/roles/os_tempest/defaults/main.yml
index 5a10576f58..1cfea5fcaf 100644
--- a/playbooks/roles/os_tempest/defaults/main.yml
+++ b/playbooks/roles/os_tempest/defaults/main.yml
@@ -82,7 +82,6 @@ tempest_requires_pip_packages:
   - python-swiftclient
   - python-troveclient
   - python-tuskarclient
-  - python-memcached
   - virtualenv
 
 tempest_pip_packages:
@@ -102,3 +101,4 @@ tempest_images:
     name: "cirros-0.3.3-x86_64-disk.img"
 
 tempest_enable_instance_password: True
+tempest_pip_instructions: "--isolated"
diff --git a/playbooks/roles/os_tempest/tasks/tempest_install.yml b/playbooks/roles/os_tempest/tasks/tempest_install.yml
index 05f8bbb952..c0dd9b823d 100644
--- a/playbooks/roles/os_tempest/tasks/tempest_install.yml
+++ b/playbooks/roles/os_tempest/tasks/tempest_install.yml
@@ -38,6 +38,7 @@
   delay: 2
   tags:
     - tempest-git-clone
+    - tempest-pip-install
 
 - name: Install pip packages for tempest
   pip:
@@ -45,7 +46,7 @@
     state: present
     virtualenv: "{{ tempest_git_dest }}"
     virtualenv_site_packages: "yes"
-    extra_args: "--isolated"
+    extra_args: "{{ tempest_pip_instructions }}"
   register: install_packages
   until: install_packages|success
   retries: 5