diff --git a/ntp/map.jinja b/ntp/map.jinja
index abeb7a5..5f8bf6e 100644
--- a/ntp/map.jinja
+++ b/ntp/map.jinja
@@ -1,15 +1,15 @@
 {% set client = salt['grains.filter_by']({
     'Arch': {
         'service': 'ntpd',
-        'mode7': True,
+        'mode7': False,
     },
     'Debian': {
         'service': 'ntp',
-        'mode7': True
+        'mode7': False
     },
     'RedHat': {
         'service': 'ntpd',
-        'mode7': True,
+        'mode7': False,
     },
 }, merge=salt['pillar.get']('ntp:client')) %}
 
diff --git a/tests/pillar/client.sls b/tests/pillar/client.sls
index ff5a5db..97671a7 100644
--- a/tests/pillar/client.sls
+++ b/tests/pillar/client.sls
@@ -2,8 +2,8 @@
   client:
     enabled: true
     strata:
-    - ntp.cesnet.cz
-    - pool.ntp.org
+    - ntp-01
+    - ntp-02
   server:
     enabled: false
     mode7: false
diff --git a/tests/pillar/server.sls b/tests/pillar/server.sls
index 86d7a0c..0d3d526 100644
--- a/tests/pillar/server.sls
+++ b/tests/pillar/server.sls
@@ -1,8 +1,4 @@
 ntp:
-  client:
-    enabled: false
-    strata:
-    - ""
   server:
     enabled: true
     strata:
@@ -13,4 +9,8 @@
         mask: 255.255.255.0
       - subnet: 172.16.1.1
         mask: 255.255.0.0
-      mode7: true
\ No newline at end of file
+    mode7: true
+  client:
+    enabled: false
+    strata:
+    - ""
\ No newline at end of file