diff --git a/tasks/configure.yml b/tasks/configure.yml
index 8c00eb8..c418289 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -45,7 +45,7 @@
   set_fact:
     puppet_agent_cmd: "{{ puppet_which.stdout }}"
   when:
-    - puppet_which_stat is defined
+    - "'stat' in puppet_which_stat"
     - puppet_which_stat.stat.exists
     - not puppet_which_stat.stat.isdir
     - puppet_which_stat.stat.executable
@@ -75,7 +75,7 @@
   set_fact:
     puppet_agent_cmd: "{{ puppet_whereis.stdout }}"
   when:
-    - puppet_whereis_stat is defined
+    - "'stat' in puppet_whereis_stat"
     - puppet_whereis_stat.stat.exists
     - not puppet_whereis_stat.stat.isdir
     - puppet_whereis_stat.stat.executable