diff --git a/sensu/client.sls b/sensu/client.sls
index 5731133..87d51e9 100644
--- a/sensu/client.sls
+++ b/sensu/client.sls
@@ -59,12 +59,24 @@
   - makedirs: true
   - user: root
 
+{%- set service_grains = {'sensu': {'check': {}}} %}
+{%- for service_name, service in pillar.items() %}
+{%- if service.get('_support', {}).get('sensu', {}).get('enabled', False) %}
+{%- set grains_fragment_file = service_name+'/meta/sensu.yml' %}
+{%- macro load_grains_file() %}{% include grains_fragment_file %}{% endmacro %}
+{%- set grains_yaml = load_grains_file()|load_yaml %}
+{%- set _dummy = service_grains.sensu.check.update(grains_yaml.check) %}
+{%- endif %}
+{%- endfor %}
+
 sensu_client_checks_grains:
   file.managed:
   - name: /etc/salt/grains.d/sensu
   - source: salt://sensu/files/sensu.grain
   - template: jinja
   - mode: 600
+  - defaults:
+    service_grains: {{ service_grains|yaml }}
   - require:
     - pkg: sensu_client_packages
     - file: sensu_client_checks_grains_dir
diff --git a/sensu/files/sensu.grain b/sensu/files/sensu.grain
index cbd1ae9..3e3b373 100644
--- a/sensu/files/sensu.grain
+++ b/sensu/files/sensu.grain
@@ -1,10 +1 @@
-{%- set service_grains = {'sensu': {'check': {}}} %}
-{%- for service_name, service in pillar.items() %}
-{%- if service.get('_support', {}).get('sensu', {}).get('enabled', False) %}
-{%- set grains_fragment_file = service_name+'/meta/sensu.yml' %}
-{%- macro load_grains_file() %}{% include grains_fragment_file %}{% endmacro %}
-{%- set grains_yaml = load_grains_file()|load_yaml %}
-{%- set _dummy = service_grains.sensu.check.update(grains_yaml.check) %}
-{%- endif %}
-{%- endfor %}
 {{ service_grains|yaml(False) }}
diff --git a/sensu/server.sls b/sensu/server.sls
index e2e3f19..764e76a 100644
--- a/sensu/server.sls
+++ b/sensu/server.sls
@@ -29,9 +29,9 @@
 
 {%- set rowloop = loop %}
 
-{%- if node_grains.get('sensu_checks', {}) is not none %}
+{%- if node_grains.get('sensu', {}) is not none %}
 
-{%- for check_name, check in node_grains.get('sensu_checks', {}).iteritems() %}
+{%- for check_name, check in node_grains.get('sensu', {}).get('checks', {}).iteritems() %}
 
 /etc/sensu/conf.d/check_{{ check_name }}.json_{{ rowloop.index }}-{{ loop.index }}:
   file.managed: