diff --git a/defaults/main.yaml b/defaults/main.yaml
index 0e671ab..a02c4bf 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -19,6 +19,7 @@ shade_git_version: master
 
 shade_install_method: git
 
-shade_pip_extra_args: ""
 shade_pip_name: shade
-shade_pip_version:
+# shade_pip_extra_args:
+# shade_pip_version:
+# shade_pip_virtualenv:
diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml
index ac74b6c..bf32f73 100644
--- a/tasks/install/git.yaml
+++ b/tasks/install/git.yaml
@@ -20,5 +20,6 @@
 
 - name: Pip install shade from local git repo.
   pip:
-    extra_args: "{{ shade_pip_extra_args }}"
+    extra_args: "{{ shade_pip_extra_args|default(omit) }}"
     name: "file://{{ shade_git_dest }}"
+    virtualenv: "{{ shade_pip_virtualenv|default(omit) }}"
diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml
index bc6a660..61f3fd6 100644
--- a/tasks/install/pip.yaml
+++ b/tasks/install/pip.yaml
@@ -14,13 +14,7 @@
 ---
 - name: Install shade using pip.
   pip:
-    extra_args: "{{ shade_pip_extra_args }}"
+    extra_args: "{{ shade_pip_extra_args|default(omit) }}"
     name: "{{ shade_pip_name }}"
-  when: shade_pip_version is none
-
-- name: Install shade using pip.
-  pip:
-    extra_args: "{{ shade_pip_extra_args }}"
-    name: "{{ shade_pip_name }}"
-    version: "{{ shade_pip_version }}"
-  when: shade_pip_version is not none
+    version: "{{ shade_pip_version|default(omit) }}"
+    virtualenv: "{{ shade_pip_virtualenv|default(omit) }}"