diff --git a/include/tests_tooling b/include/tests_tooling
index 4d28b653..4f89f1ad 100644
--- a/include/tests_tooling
+++ b/include/tests_tooling
@@ -15,14 +15,13 @@
 #################################################################################
 #
     AUTOMATION_TOOL_FOUND=0
+    AUTOMATION_TOOL_RUNNING=""
     BACKUP_AGENT_FOUND=0
+    PUPPET_MASTER_RUNNING=0
 #
 #################################################################################
 #
     InsertSection "Software: System tooling"
-
-PUPPET_MASTER_RUNNING=0
-
 #
 #################################################################################
 #
@@ -54,9 +53,29 @@ PUPPET_MASTER_RUNNING=0
         if [ ${RUNNING} -eq 1 ]; then
             logtext "Result: found puppet master"
             PUPPET_MASTER_RUNNING=1
+            report "automation_tool_running[]=puppet"
             Display --indent 4 --text "Found: Puppet (master)" --result FOUND --color GREEN
         fi
 
+        # SaltStack
+        if [ ! "${SALTMINIONBINARY}" = "" ]; then
+            logtext "Result: SaltStack (salt-minion) is installed (${SALTMINIONBINARY})"
+            AUTOMATION_TOOL_FOUND=1
+            Display --indent 4 --text "Found: SaltStack minion (salt-minion)" --result FOUND --color GREEN
+        fi
+        if [ ! "${SALTMASTERBINARY}" = "" ]; then
+            logtext "Result: SaltStack (salt-master) is installed (${SALTMASTERBINARY})"
+            AUTOMATION_TOOL_FOUND=1
+            Display --indent 4 --text "Found: SaltStack master (salt-master)" --result FOUND --color GREEN
+        fi
+        IsRunning "salt-master"
+        if [ ${RUNNING} -eq 1 ]; then
+            logtext "Result: found SaltStack (master)"
+            SALT_MASTER_RUNNING=1
+            report "automation_tool_running[]=saltstack-master"
+            Display --indent 4 --text "Found: SaltStack (master)" --result FOUND --color GREEN
+        fi
+
         if [ ${AUTOMATION_TOOL_FOUND} -eq 1 ]; then
             Display --indent 2 --text "- Automation tooling" --result FOUND --color GREEN
           else
@@ -70,9 +89,13 @@ PUPPET_MASTER_RUNNING=0
 # Backup tools
 #
 #################################################################################
+#
+    # Netvault
+    # Rsync in cron
+#
+#################################################################################
 #
     wait_for_keypress
-
 #
 #================================================================================
 # Lynis - Copyright 2007-2014, Michael Boelen - www.rootkit.nl - The Netherlands