diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index ac1d838a..aab53615 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -87,6 +87,11 @@
 #   { python-path => '/my/python/virtualenv' }
 #   Defaults to {}
 #
+# [*vhost_custom_fragment*]
+#   (optional) Passes a string of custom configuration
+#   directives to be placed at the end of the vhost configuration.
+#   Defaults to undef.
+#
 # == Example:
 #
 #   include apache
@@ -113,6 +118,7 @@ class octavia::wsgi::apache (
   $access_log_format           = false,
   $error_log_file              = undef,
   $custom_wsgi_process_options = {},
+  $vhost_custom_fragment       = undef,
 ) {
 
   include octavia::deps
@@ -139,6 +145,7 @@ class octavia::wsgi::apache (
     ssl_key                     => $ssl_key,
     threads                     => $threads,
     user                        => 'octavia',
+    vhost_custom_fragment       => $vhost_custom_fragment,
     workers                     => $workers,
     wsgi_daemon_process         => 'octavia',
     wsgi_process_display_name   => $wsgi_process_display_name,
diff --git a/spec/classes/octavia_wsgi_apache_spec.rb b/spec/classes/octavia_wsgi_apache_spec.rb
new file mode 100644
index 00000000..d5a2c83b
--- /dev/null
+++ b/spec/classes/octavia_wsgi_apache_spec.rb
@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+describe 'octavia::wsgi::apache' do
+
+  shared_examples_for 'apache serving octavia with mod_wsgi' do
+    context 'with default parameters' do
+      it { is_expected.to contain_class('octavia::params') }
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::mod::wsgi') }
+      it { is_expected.to_not contain_class('apache::mod::ssl') }
+      it { is_expected.to contain_openstacklib__wsgi__apache('octavia_wsgi').with(
+        :bind_port                   => 9876,
+        :group                       => 'octavia',
+        :path                        => '/',
+        :servername                  => facts[:fqdn],
+        :ssl                         => false,
+        :threads                     => 1,
+        :user                        => 'octavia',
+        :workers                     => facts[:os_workers],
+        :wsgi_daemon_process         => 'octavia',
+        :wsgi_process_group          => 'octavia',
+        :wsgi_script_dir             => platform_params[:wsgi_script_path],
+        :wsgi_script_file            => 'app',
+        :wsgi_script_source          => platform_params[:wsgi_script_source],
+        :custom_wsgi_process_options => {},
+        :access_log_file             => false,
+        :access_log_format           => false,
+      )}
+    end
+
+    context 'when overriding parameters using different ports' do
+      let :params do
+        {
+          :servername                  => 'dummy.host',
+          :bind_host                   => '10.42.51.1',
+          :port                        => 12345,
+          :ssl                         => true,
+          :wsgi_process_display_name   => 'octavia',
+          :workers                     => 37,
+          :custom_wsgi_process_options => {
+            'python_path' => '/my/python/path',
+          },
+          :access_log_file             => '/var/log/httpd/access_log',
+          :access_log_format           => 'some format',
+          :error_log_file              => '/var/log/httpd/error_log',
+          :vhost_custom_fragment       => 'Timeout 99'
+        }
+      end
+      it { is_expected.to contain_class('octavia::params') }
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::mod::wsgi') }
+      it { is_expected.to contain_class('apache::mod::ssl') }
+      it { is_expected.to contain_openstacklib__wsgi__apache('octavia_wsgi').with(
+        :bind_host                 => '10.42.51.1',
+        :bind_port                 => 12345,
+        :group                     => 'octavia',
+        :path                      => '/',
+        :servername                => 'dummy.host',
+        :ssl                       => true,
+        :threads                   => 1,
+        :user                      => 'octavia',
+        :workers                   => 37,
+        :vhost_custom_fragment     => 'Timeout 99',
+        :wsgi_daemon_process       => 'octavia',
+        :wsgi_process_display_name => 'octavia',
+        :wsgi_process_group        => 'octavia',
+        :wsgi_script_file          => 'app',
+        :custom_wsgi_process_options => {
+          'python_path' => '/my/python/path',
+        },
+        :access_log_file           => '/var/log/httpd/access_log',
+        :access_log_format         => 'some format',
+        :error_log_file            => '/var/log/httpd/error_log'
+      )}
+    end
+  end
+
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts({
+          :os_workers     => 42,
+          :concat_basedir => '/var/lib/puppet/concat',
+          :fqdn           => 'some.host.tld',
+        }))
+      end
+
+      let(:platform_params) do
+        case facts[:osfamily]
+        when 'Debian'
+          {
+            :httpd_service_name => 'apache2',
+            :httpd_ports_file   => '/etc/apache2/ports.conf',
+            :wsgi_script_path   => '/usr/lib/cgi-bin/octavia',
+            :wsgi_script_source => '/usr/bin/octavia-wsgi',
+          }
+        when 'RedHat'
+          {
+            :httpd_service_name => 'httpd',
+            :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
+            :wsgi_script_path   => '/var/www/cgi-bin/octavia',
+            :wsgi_script_source => '/usr/bin/octavia-wsgi',
+          }
+        end
+      end
+
+      it_behaves_like 'apache serving octavia with mod_wsgi'
+    end
+  end
+end