diff --git a/defaults/main.yml b/defaults/main.yml
index 5a615540..74049cb4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -316,7 +316,6 @@ swift_do_sync: True
 # swift packages that must be installed before anything else
 swift_requires_pip_packages:
   - virtualenv
-  - virtualenv-tools
   - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - httplib2
 
diff --git a/tasks/swift_install.yml b/tasks/swift_install.yml
index e0424190..d3cd27dd 100644
--- a/tasks/swift_install.yml
+++ b/tasks/swift_install.yml
@@ -112,9 +112,12 @@
     - swift_get_venv | changed
 
 - name: Update virtualenv path
-  command: >
-    virtualenv-tools --update-path=auto --reinitialize {{ swift_bin | dirname }}
+  shell: |
+    find {{ swift_bin }} -name \*.pyc -delete
+    sed -si '1s/^.*python.*$/#!{{ swift_bin | replace ('/','\/') }}\/python/' {{ swift_bin }}/*
   when: swift_get_venv | changed
+  tags:
+    - skip_ansible_lint
 
 - include: swift_pypy_setup.yml
   static: no