diff --git a/defaults/main.yml b/defaults/main.yml
index 3f6568b7..3faca81e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -425,7 +425,6 @@ keystone_ceilometer_enabled: false
 # Keystone packages that must be installed before anything else
 keystone_requires_pip_packages:
   - virtualenv
-  - virtualenv-tools
   - python-keystoneclient # Keystoneclient needed to OSA keystone lib
 
 # Common pip packages
diff --git a/tasks/keystone_install.yml b/tasks/keystone_install.yml
index d2568628..e3e17649 100644
--- a/tasks/keystone_install.yml
+++ b/tasks/keystone_install.yml
@@ -171,9 +171,12 @@
     - keystone_get_venv | changed
 
 - name: Update virtualenv path
-  command: >
-    virtualenv-tools --update-path=auto --reinitialize {{ keystone_bin | dirname }}
+  shell: |
+    find {{ keystone_bin }} -name \*.pyc -delete
+    sed -si '1s/^.*python.*$/#!{{ keystone_bin | replace ('/','\/') }}\/python/' {{ keystone_bin }}/*
   when: keystone_get_venv | changed
+  tags:
+    - skip_ansible_lint
 
 - name: Create WSGI symlinks
   file: