diff --git a/postgresql/_database.sls b/postgresql/_database.sls
index ec0de9f..18bf237 100644
--- a/postgresql/_database.sls
+++ b/postgresql/_database.sls
@@ -1,5 +1,4 @@
 {%- for user in database.get('users', []) %}
-{% if not grains.get('noservices', False) %}
 postgresql_user_{{ svr_name|default('localhost') }}_{{ database_name }}_{{ user.name }}:
   postgres_user.present:
     - name: {{ user.name }}
@@ -18,10 +17,11 @@
     {%- endfor %}
     - user: root
     {%- endif %}
-{%- endif %}
+    {%- if grains.get('noservices') %}
+    - onlyif: /bin/false
+   {%- endif %}
 {%- endfor %}
 
-{% if not grains.get('noservices', False) %}
 postgresql_database_{{ svr_name|default('localhost') }}_{{ database_name }}:
   postgres_database.present:
     - name: {{ database.get('name', database_name) }}
@@ -41,7 +41,9 @@
     {%- endfor %}
     - user: root
     {%- endif %}
-{%- endif %}
+    {%- if grains.get('noservices') %}
+    - onlyif: /bin/false
+    {%- endif %}
 
 {%- if database.init is defined %}
 {%- for query in database.init.get('queries', []) %}
@@ -95,14 +97,15 @@
         - file: postgresql_dirs
         - postgres_database: postgresql_database_{{ database_name }}
 
-{% if not grains.get('noservices', False) %}
 restore_postgresql_database_{{ database_name }}:
   cmd.run:
     - name: /root/postgresql/scripts/restore_{{ database_name }}.sh
     - unless: "[ -f /root/postgresql/flags/{{ database_name }}-installed ]"
     - cwd: /root
+    {%- if grains.get('noservices') %}
+    - onlyif: /bin/false
+    {%- endif %}
     - require:
         - file: /root/postgresql/scripts/restore_{{ database_name }}.sh
-{%- endif %}
 
 {%- endif %}
diff --git a/postgresql/server.sls b/postgresql/server.sls
index fda0be4..a431669 100644
--- a/postgresql/server.sls
+++ b/postgresql/server.sls
@@ -12,18 +12,19 @@
 
 {%- if grains.os_family == "Debian" %}
 
-{% if not grains.get('noservices', False) %}
 init_postgresql_cluster:
   postgres_cluster.present:
   - name: main
   - version: "{{ server.version }}"
   - datadir: "{{ server.dir.data }}"
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - require:
     - pkg: postgresql_packages
   - require_in:
     - file: {{ server.dir.config }}/pg_hba.conf
     - file: {{ server.dir.config }}/postgresql.conf
-{%- endif %}
 
 {{ server.dir.config }}/pg_hba.conf:
   file.managed:
@@ -55,17 +56,18 @@
 
 {%- if grains.os_family == "Debian" %}
 
-{% if not grains.get('noservices', False) %}
 postgresql_service:
   service.running:
   - name: {{ server.service }}
   - enable: true
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: {{ server.dir.config }}/pg_hba.conf
     - file: {{ server.dir.config }}/postgresql.conf
   - require:
     - file: /root/.pgpass
-{%- endif %}
 
 {%- for database_name, database in server.get('database', {}).iteritems() %}
   {%- include "postgresql/_database.sls" %}
@@ -80,12 +82,14 @@
 
     {%- endif %}
 
-{% if not grains.get('noservices', False) %}
 database_{{ database_name }}_{{ extension_name }}_extension_present:
   postgres_extension.present:
   - name: {{ extension_name }}
   - maintenance_db: {{ database_name }}
   - user: postgres
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - require:
     - postgres_database: postgresql_database_{{ database_name }}
 
@@ -96,9 +100,11 @@
   - name: {{ extension_name }}
   - maintenance_db: {{ database_name }}
   - user: postgres
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - require:
     - postgres_database: postgresql_database_{{ database_name }}
-{%- endif %}
 
     {%- endif %}
   {%- endfor %}