diff --git a/salt/saltcheck-tests/api.tst b/salt/saltcheck-tests/api.tst
new file mode 100644
index 0000000..57035bf
--- /dev/null
+++ b/salt/saltcheck-tests/api.tst
@@ -0,0 +1,26 @@
+{% from "salt/map.jinja" import salt_settings with context %}
+
+{% if salt_settings.install_packages %}
+api_installed:
+  module_and_function: pkg.version
+  args:
+    - {{ salt_settings.salt_api }}
+  {%- if salt_settings.version is defined %}
+  assertion: assertEqual
+  expected-return: {{ salt_settings.version }}
+  {% else %}
+  assertion: assertNotEmpty
+  {%- endif %}
+{% endif %}
+
+api_running:
+  module_and_function: service.status
+  args:
+    - {{ salt_settings.api_service }}
+  assertion: assertTrue
+
+api_enabled:
+  module_and_function: service.enabled
+  args:
+    - {{ salt_settings.api_service }}
+  assertion: assertTrue
diff --git a/salt/saltcheck-tests/master.tst b/salt/saltcheck-tests/master.tst
new file mode 100644
index 0000000..73c917b
--- /dev/null
+++ b/salt/saltcheck-tests/master.tst
@@ -0,0 +1,47 @@
+{% from "salt/map.jinja" import salt_settings with context %}
+
+{% if salt_settings.install_packages %}
+master_installed:
+  module_and_function: pkg.version
+  args:
+    - {{ salt_settings.salt_master }}
+  {%- if salt_settings.version is defined %}
+  assertion: assertEqual
+  expected-return: {{ salt_settings.version }}
+  {% else %}
+  assertion: assertNotEmpty
+  {%- endif %}
+{% endif %}
+
+master_running:
+  module_and_function: service.status
+  args:
+    - {{ salt_settings.master_service }}
+  assertion: assertTrue
+
+master_enabled:
+  module_and_function: service.enabled
+  args:
+    - {{ salt_settings.master_service }}
+  assertion: assertTrue
+
+master_conf_deployed:
+  module_and_function: file.search
+  args:
+    - {{ salt_settings.config_path }}/master.d/f_defaults.conf
+    - This file managed by Salt, do not edit by hand
+  assertion: assertTrue
+
+{% if salt_settings.master_remove_config %}
+default-master-conf-removed:
+  module_and_function: file.file_exists
+  args:
+    - {{ salt_settings.config_path }}/master
+  assertion: assertFalse
+{% endif %}
+
+old-master-conf-removed:
+  module_and_function: file.file_exists
+  args:
+    - {{ salt_settings.config_path }}/master.d/_defaults.conf
+  assertion: assertFalse
diff --git a/salt/saltcheck-tests/minion.tst b/salt/saltcheck-tests/minion.tst
new file mode 100644
index 0000000..45962f8
--- /dev/null
+++ b/salt/saltcheck-tests/minion.tst
@@ -0,0 +1,55 @@
+{% from "salt/map.jinja" import salt_settings with context %}
+
+{% if salt_settings.install_packages %}
+minion_installed:
+  module_and_function: pkg.version
+  args:
+    - {{ salt_settings.salt_minion }}
+  {%- if salt_settings.version is defined %}
+  assertion: assertEqual
+  expected-return: {{ salt_settings.version }}
+  {% else %}
+  assertion: assertNotEmpty
+  {%- endif %}
+{% endif %}
+
+minion_running:
+  module_and_function: service.status
+  args:
+    - {{ salt_settings.minion_service }}
+  assertion: assertTrue
+
+minion_enabled:
+  module_and_function: service.enabled
+  args:
+    - {{ salt_settings.minion_service }}
+  assertion: assertTrue
+
+minion_conf_deployed:
+  module_and_function: file.search
+  args:
+    - {{ salt_settings.config_path }}/master.d/f_defaults.conf
+    - This file managed by Salt, do not edit by hand!!
+  assertion: assertTrue
+
+{% if salt_settings.minion_remove_config %}
+default-minion-conf-removed:
+  module_and_function: file.file_exists
+  args:
+    - {{ salt_settings.config_path }}/minion
+  assertion: assertFalse
+{% endif %}
+
+old-minion-conf-removed:
+  module_and_function: file.file_exists
+  args:
+    - {{ salt_settings.config_path }}/minion
+  assertion: assertFalse
+
+{% if 'inotify' in  salt_settings.get('minion', {}).get('beacons', {}) and salt_settings.get('pyinotify', False) %}
+inotify_installed:
+  module_and_function: pkg.version
+  args:
+    - {{ salt_settings.pyinotify }}
+  assertion: assertNotEmpty
+{% endif %}
diff --git a/salt/saltcheck-tests/ssh.tst b/salt/saltcheck-tests/ssh.tst
new file mode 100644
index 0000000..7db83a9
--- /dev/null
+++ b/salt/saltcheck-tests/ssh.tst
@@ -0,0 +1,21 @@
+{% from "salt/map.jinja" import salt_settings with context %}
+
+{% if salt_settings.install_packages %}
+master_installed:
+  module_and_function: pkg.version
+  args:
+    - {{ salt_settings.salt_ssh }}
+  {%- if salt_settings.version is defined %}
+  assertion: assertEqual
+  expected-return: {{ salt_settings.version }}
+  {% else %}
+  assertion: assertNotEmpty
+  {%- endif %}
+{% endif %}
+
+roster_deployed:
+  module_and_function: file.search
+  args:
+    - {{ salt_settings.config_path }}/roster
+    - This file is managed by Salt! Do not edit by hand!
+  assertion: assertTrue