diff --git a/bind/map.jinja b/bind/map.jinja
index abf4c54..169c744 100644
--- a/bind/map.jinja
+++ b/bind/map.jinja
@@ -38,7 +38,7 @@
         'default_config': '/etc/sysconfig/named',
         'named_directory': '/var/named',
         'chroot_dir': '',
-        'log_dir': '/var/log/named',
+        'log_dir': '/var/named/data',
         'log_mode': '640',
         'user': 'named',
         'group': 'named',
diff --git a/test/integration/default/config_spec.rb b/test/integration/default/config_spec.rb
index 991e993..1751621 100644
--- a/test/integration/default/config_spec.rb
+++ b/test/integration/default/config_spec.rb
@@ -24,12 +24,17 @@ when 'arch','redhat', 'centos', 'fedora'
   named_directory = '/var/named'
   zones_directory = named_directory
   keys_directory  = '/etc/named.keys'
-  log_directory   = '/var/log/named'
   keys_mode       = '0755'
   conf_mode       = '0640'
   config          = '/etc/named.conf'
-when 'ubuntu'
+end
+
+# Override log directory by OS
+case os[:name]
+when 'arch', 'ubuntu'
   log_directory   = '/var/log/named'
+when 'redhat', 'centos', 'fedora'
+  log_directory   = '/var/named/data'
 end
 
 # Check main config dir
diff --git a/test/integration/default/zones_spec.rb b/test/integration/default/zones_spec.rb
index d5a3db0..237c3de 100644
--- a/test/integration/default/zones_spec.rb
+++ b/test/integration/default/zones_spec.rb
@@ -24,12 +24,17 @@ when 'arch','redhat', 'centos', 'fedora'
   named_directory = '/var/named'
   zones_directory = named_directory
   keys_directory  = '/etc/named.keys'
-  log_directory   = '/var/log/named'
   keys_mode       = '0755'
   conf_mode       = '0640'
   config          = '/etc/named.conf'
-when 'ubuntu'
+end
+
+# Override log directory by OS
+case os[:name]
+when 'arch', 'ubuntu'
   log_directory   = '/var/log/named'
+when 'redhat', 'centos', 'fedora'
+  log_directory   = '/var/named/data'
 end
 
 # Test example.com zonefile
@@ -153,4 +158,3 @@ control 'File ' + zones_directory + '/100.51.198.in-addr.arpa.include' do
     its('content') { should match '7.100.51.198.in-addr.arpa. PTR mx1.example.net.' }
   end
 end
-