diff --git a/tasks/main.yml b/tasks/main.yml
index 325fb85..31e17d0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,19 +1,19 @@
+- name: Check if we need to install pip
+  shell: "{{ansible_python_interpreter}} -m pip --version"
+  register: need_pip
+  ignore_errors: True
+  changed_when: false
+
 - name: Check if bootstrap is needed
   raw: stat $HOME/.bootstrapped
   register: need_bootstrap
   ignore_errors: True
+  when: need_pip | failed
 
 - name: Run bootstrap.sh
   script: bootstrap.sh
   when: need_bootstrap | failed
 
-- name: Check if we need to install pip
-  shell: "{{ansible_python_interpreter}} -m pip --version"
-  register: need_pip
-  ignore_errors: True
-  changed_when: false
-  when: need_bootstrap | failed
-
 - name: Copy get-pip.py
   copy: src=get-pip.py dest=~/get-pip.py
   when: need_pip | failed