diff --git a/manifests/init.pp b/manifests/init.pp
index 984eb23b..9024c344 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -161,6 +161,8 @@
 #   Defaults to false
 #  [*congress_available*]
 #   Defaults to false
+#  [*octavia_available*]
+#   Defaults to false
 #  [*keystone_v2*]
 #   Defaults to true
 #  [*keystone_v3*]
@@ -314,6 +316,7 @@ class tempest(
   $mistral_available             = false,
   $vitrage_available             = false,
   $congress_available            = false,
+  $octavia_available             = false,
   $keystone_v2                   = true,
   $keystone_v3                   = true,
   $auth_version                  = 'v2',
@@ -524,6 +527,7 @@ class tempest(
     'service_available/zaqar':                         value => $zaqar_available;
     'service_available/ec2api':                        value => $ec2api_available;
     'service_available/congress':                      value => $congress_available;
+    'service_available/octavia':                       value => $octavia_available;
     'whitebox/db_uri':                                 value => $whitebox_db_uri;
     'cli/cli_dir':                                     value => $cli_dir;
     'scenario/img_dir':                                value => $img_dir;
@@ -719,6 +723,13 @@ class tempest(
         tag    => ['openstack', 'tempest-package'],
       }
     }
+    if $octavia_available and $::tempest::params::python_octavia_tests {
+      package { 'python-octavia-tests':
+        ensure => present,
+        name   => $::tempest::params::python_octavia_tests,
+        tag    => ['openstack', 'tempest-package'],
+      }
+    }
   }
 
   if $configure_images {
diff --git a/manifests/params.pp b/manifests/params.pp
index 22028de2..df9a4138 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -37,6 +37,7 @@ class tempest::params {
       $python_zaqar_tests      = 'python-zaqar-tests'
       $python_congress_tests   = 'python-congress-tests'
       $python_panko_tests      = 'python-panko-tests'
+      $python_octavia_tests    = 'python-octavia-tests'
       $package_name            = 'openstack-tempest'
     }
     'Debian': {
@@ -72,6 +73,7 @@ class tempest::params {
       $python_zaqar_tests      = false
       $python_congress_tests   = false
       $python_panko_tests      = false
+      $python_octavia_tests    = false
       $package_name            = 'tempest'
     }
     default: {
diff --git a/releasenotes/notes/add-octavia-support-9fb2e93e7ce38be7.yaml b/releasenotes/notes/add-octavia-support-9fb2e93e7ce38be7.yaml
new file mode 100644
index 00000000..131d9fa7
--- /dev/null
+++ b/releasenotes/notes/add-octavia-support-9fb2e93e7ce38be7.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add Octavia Tempest plugin support.
diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb
index 45bde150..44be7f2c 100644
--- a/spec/classes/tempest_init_spec.rb
+++ b/spec/classes/tempest_init_spec.rb
@@ -262,6 +262,7 @@ describe 'tempest' do
           is_expected.to contain_tempest_config('service_available/zaqar').with(:value => false)
           is_expected.to contain_tempest_config('service_available/congress').with(:value => false)
           is_expected.to contain_tempest_config('service_available/designate').with(:value => false)
+          is_expected.to contain_tempest_config('service_available/octavia').with(:value => false)
           is_expected.to contain_tempest_config('whitebox/db_uri').with(:value => nil)
           is_expected.to contain_tempest_config('cli/cli_dir').with(:value => nil)
           is_expected.to contain_tempest_config('oslo_concurrency/lock_path').with(:value => '/var/lib/tempest')