diff --git a/include/tests_tooling b/include/tests_tooling
index 302a28d9..a8797263 100644
--- a/include/tests_tooling
+++ b/include/tests_tooling
@@ -20,6 +20,8 @@
     PUPPET_MASTER_RUNNING=0
     SALT_MASTER_RUNNING=0
     SALT_MINION_RUNNING=0
+    CF3_MASTER_RUNNING=0
+    CF3_MINION_RUNNING=0
 #
 #################################################################################
 #
@@ -44,6 +46,24 @@
             AUTOMATION_TOOL_FOUND=1
             Display --indent 4 --text "Found: Cfengine (cfagent)" --result FOUND --color GREEN
         fi
+        # Cfengine 3
+        CF3_LOCATIONS="/var/cfengine/bin"
+        for I in ${CF3_LOCATIONS}; do
+            if [ -d ${I} ]; then
+                if [ -e ${I}/cf-agent ]; then
+                    logtext "Result: found Cfengine3 agent (cf-agent) in ${I}"
+		    AUTOMATION_TOOL_FOUND=1
+		    Display --indent 4 --text "Found: Cfengine (agent)" --result FOUND --color GREEN
+		fi
+		IsRunning "cf-server"
+		if [ ${RUNNING} -eq 1 ]; then
+		    logtext "Result: found cfengine server"
+		    CF3_MASTER_RUNNING=1
+		    report "automation_tool_running[]=cf-server"
+		    Display --indent 4 --text "Found: Cfengine (server)" --result FOUND --color GREEN
+		fi
+            fi
+        done
 
         CHEF_LOCATIONS="/opt/chef/bin /opt/chef-server/sv /opt/chefdk/bin"
         for I in ${CHEF_LOCATIONS}; do