diff --git a/ci/tests.yml b/ci/tests.yml
index 357db63..797d973 100644
--- a/ci/tests.yml
+++ b/ci/tests.yml
@@ -14,4 +14,4 @@
 
     - fail: 
         msg: "Node Not Found, tests failed."
-      when: node_path.stdout != "/usr/local/bin/node"
+      when: node_path.rc != 0
diff --git a/defaults/main.yml b/defaults/main.yml
index ff5db1e..0680397 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 nodejs_playbook_version: "0.1.6"
-nodejs_install_source: build #One of: build (from source), nodesource_debs (works only on debian-based distros)
+nodejs_install_source: '{% if ansible_os_family == "Debian" %}nodesource_debs{% else %}build{% endif %}'
 nodejs_version: "0.10.36"
 nodejs_path: "/usr/local/"
 nodejs_tmp_dir: "/tmp/"