diff --git a/spec/acceptance/fixtures/default.pp b/spec/acceptance/fixtures/default.pp
index ebd192d..5b7ef43 100644
--- a/spec/acceptance/fixtures/default.pp
+++ b/spec/acceptance/fixtures/default.pp
@@ -13,12 +13,6 @@ httpd::vhost { 'localhost':
 # Enable a secondary port to test proxy and redirect modules
 $override = '
 Listen 8080
-<Directory "/html">
-  Options All
-  AllowOverride All
-  Require all granted
-  Allow from all
-</Directory>
 '
 file { "${::httpd::params::vdir}override.conf":
   content => $override,
diff --git a/templates/vhost-default.conf.erb b/templates/vhost-default.conf.erb
index fdc8336..f960f79 100644
--- a/templates/vhost-default.conf.erb
+++ b/templates/vhost-default.conf.erb
@@ -18,6 +18,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
     Order allow,deny
     allow from all
     Satisfy any
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
   </Directory>
   ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
   LogLevel warn
diff --git a/templates/vhost-proxy.conf.erb b/templates/vhost-proxy.conf.erb
index 05c6a8a..b40f8b3 100644
--- a/templates/vhost-proxy.conf.erb
+++ b/templates/vhost-proxy.conf.erb
@@ -15,6 +15,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
    <Proxy *>
      Order deny,allow
      Allow from all
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
    </Proxy>
    ProxyPass        / <%= @dest %>/
    ProxyPassReverse / <%= @dest %>/