diff --git a/defaults/main.yml b/defaults/main.yml
index 4ca31290..bfff96b2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -258,7 +258,6 @@ cinder_service_in_ldap: false
 # Cinder packages that must be installed before anything else
 cinder_requires_pip_packages:
   - virtualenv
-  - virtualenv-tools
   - python-keystoneclient # Keystoneclient needed by the keystone Ansible module
   - httplib2
 
diff --git a/tasks/cinder_install.yml b/tasks/cinder_install.yml
index ef0ec1d5..653bff77 100644
--- a/tasks/cinder_install.yml
+++ b/tasks/cinder_install.yml
@@ -111,10 +111,14 @@
     - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
     - cinder_get_venv | changed
 
-- name: Update virtualenv path
-  command: >
-    virtualenv-tools --update-path=auto --reinitialize {{ cinder_bin | dirname }}
+- name: Reset virtualenv and update its paths
+  shell: |
+    find {{ cinder_bin }} -name \*.pyc -delete
+    sed -si '1s/^.*python.*$/#!{{ cinder_bin | replace ('/','\/') }}\/python/' {{ cinder_bin }}/*
+    virtualenv {{ cinder_bin | dirname }}
   when: cinder_get_venv | changed
+  tags:
+    - skip_ansible_lint
 
 - name: Initialise the upgrade facts
   ini_file: