diff --git a/README.md b/README.md
index 7965275d3..c58ce62df 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ scenario](#all-in-one).
 | swift      |             |             |       X     |             |             |             |              |
 | sahara     |             |             |             |       X     |             |             |              |
 | trove      |             |             |             |       X     |             |             |              |
-| horizon    |             |             |             |       X     |             |             |      X       |
+| horizon    |             |             |             |       X     |      X      |             |      X       |
 | ironic     |             |             |       X     |             |             |             |              |
 | zaqar      |             |             |       X     |             |             |             |              |
 | murano     |             |             |             |       X     |             |             |              |
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index 67031d056..69c00100d 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -69,6 +69,9 @@ class { 'openstack_integration::ceph':
   deploy_rgw   => true,
   swift_dropin => true,
 }
+class { 'openstack_integration::horizon':
+  octavia_enabled => true
+}
 if $watcher_enabled {
   include openstack_integration::watcher
 }
@@ -79,6 +82,7 @@ include openstack_integration::provision
 # Don't test swift, radosgw won't pass the current tests
 # Glance, nova, neutron are true by default.
 class { 'openstack_integration::tempest':
+  horizon     => true,
   watcher     => $watcher_enabled,
   bgpvpn      => $bgpvpn_enabled,
   l2gw        => $l2gw_enabled,
diff --git a/manifests/horizon.pp b/manifests/horizon.pp
index df575e4aa..391ca4ccc 100644
--- a/manifests/horizon.pp
+++ b/manifests/horizon.pp
@@ -4,8 +4,13 @@
 #  (optional) Flag to enable heat dashboard
 #  Defaults to false.
 #
+# [*octavia_enabled*]
+#  (optional) Flag to enable octavia dashboard
+#  Defaults to false.
+#
 class openstack_integration::horizon (
-  $heat_enabled = false,
+  $heat_enabled    = false,
+  $octavia_enabled = false,
 ) {
 
   include openstack_integration::config
@@ -57,4 +62,7 @@ class openstack_integration::horizon (
   if $heat_enabled {
     class { 'horizon::dashboards::heat': }
   }
+  if $octavia_enabled {
+    class { 'horizon::dashboards::octavia': }
+  }
 }