diff --git a/ntp/files/ntp.conf b/ntp/files/ntp.conf
index d4789e2..5dd8534 100644
--- a/ntp/files/ntp.conf
+++ b/ntp/files/ntp.conf
@@ -9,13 +9,13 @@
 # - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
 
 # Associate to cloud NTP pool servers
-{%- if client.get('enabled', True) %}
+{%- if client.get('enabled', False) %}
 {%- for stratum in client.strata %}
 server {{ stratum }}{% if loop.first %} iburst{% endif %}
 {%- endfor %}
 {%- endif %}
 
-{%- if server.get('enabled', True) %}
+{%- if server.get('enabled', False) %}
 {%- for stratum in server.strata %}
 server {{ stratum }}{% if loop.first %} iburst{% endif %}
 {%- endfor %}
diff --git a/ntp/map.jinja b/ntp/map.jinja
index 5f8bf6e..3f4d703 100644
--- a/ntp/map.jinja
+++ b/ntp/map.jinja
@@ -5,7 +5,7 @@
     },
     'Debian': {
         'service': 'ntp',
-        'mode7': False
+        'mode7': False,
     },
     'RedHat': {
         'service': 'ntpd',
diff --git a/tests/pillar/client.sls b/tests/pillar/client.sls
index 97671a7..58ae2aa 100644
--- a/tests/pillar/client.sls
+++ b/tests/pillar/client.sls
@@ -2,8 +2,5 @@
   client:
     enabled: true
     strata:
-    - ntp-01
-    - ntp-02
-  server:
-    enabled: false
-    mode7: false
+    - ntp.cesnet.cz
+    - pool.ntp.org
diff --git a/tests/pillar/server.sls b/tests/pillar/server.sls
index 8fa0baa..0f2e2f2 100644
--- a/tests/pillar/server.sls
+++ b/tests/pillar/server.sls
@@ -9,13 +9,10 @@
         mask: 255.255.255.0
       - subnet: 172.16.1.1
         mask: 255.255.0.0
+        options: notrap nomodify
     mode7: true
     peers:
       - 192.168.31.1
       - 192.168.31.2
       - 192.168.31.3
     orphan: 5
-  client:
-    enabled: false
-    strata:
-    - ""
\ No newline at end of file