diff --git a/manifests/init.pp b/manifests/init.pp
index 4131e93c..6db07c90 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -108,6 +108,8 @@
 #   Defaults to false
 #  [*aodh_available*]
 #   Defaults to false
+#  [*gnocchi_available*]
+#   Defaults to false
 #  [*horizon_available*]
 #   Defaults to true
 #  [*neutron_available*]
@@ -236,6 +238,7 @@ class tempest(
   $heat_available                = false,
   $ceilometer_available          = false,
   $aodh_available                = false,
+  $gnocchi_available             = false,
   $horizon_available             = true,
   $neutron_available             = false,
   $nova_available                = true,
@@ -365,6 +368,7 @@ class tempest(
     'service_available/heat':                      value => $heat_available;
     'service_available/ceilometer':                value => $ceilometer_available;
     'service_available/aodh':                      value => $aodh_available;
+    'service_available/gnocchi':                   value => $gnocchi_available;
     'service_available/horizon':                   value => $horizon_available;
     'service_available/neutron':                   value => $neutron_available;
     'service_available/nova':                      value => $nova_available;
@@ -416,6 +420,13 @@ class tempest(
         tag    => ['openstack', 'tempest-package'],
       }
     }
+    if $gnocchi_available and $::tempest::params::python_gnocchi_tests {
+      package { 'python-gnocchi-tests':
+        ensure => present,
+        name   => $::tempest::params::python_gnocchi_tests,
+        tag    => ['openstack', 'tempest-package'],
+      }
+    }
     if $heat_available and $::tempest::params::python_heat_tests {
       package { 'python-heat-tests':
         ensure => present,
diff --git a/manifests/params.pp b/manifests/params.pp
index b3acb841..74f7d652 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -16,6 +16,7 @@ class tempest::params {
       $python_ceilometer_tests = 'python-ceilometer-tests'
       $python_cinder_tests     = 'python-cinder-tests'
       $python_glance_tests     = 'python-glance-tests'
+      $python_gnocchi_tests    = 'python-gnocchi-tests'
       $python_heat_tests       = 'python-heat-tests'
       $python_ironic_tests     = 'python-ironic-tests'
       $python_keystone_tests   = 'python-keystone-tests'
@@ -47,6 +48,7 @@ class tempest::params {
       $python_ceilometer_tests = false
       $python_cinder_tests     = false
       $python_glance_tests     = false
+      $python_gnocchi_tests    = false
       $python_heat_tests       = false
       $python_ironic_tests     = false
       $python_keystone_tests   = false
diff --git a/releasenotes/notes/add_gnocchi-f8b3d64466d021ce.yaml b/releasenotes/notes/add_gnocchi-f8b3d64466d021ce.yaml
new file mode 100644
index 00000000..5743bde4
--- /dev/null
+++ b/releasenotes/notes/add_gnocchi-f8b3d64466d021ce.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add support for Gnocchi tests.
diff --git a/spec/classes/tempest_spec.rb b/spec/classes/tempest_spec.rb
index 0f35e13d..b96957a1 100644
--- a/spec/classes/tempest_spec.rb
+++ b/spec/classes/tempest_spec.rb
@@ -207,6 +207,7 @@ describe 'tempest' do
           is_expected.to contain_tempest_config('service_available/heat').with(:value => false)
           is_expected.to contain_tempest_config('service_available/ceilometer').with(:value => false)
           is_expected.to contain_tempest_config('service_available/aodh').with(:value => false)
+          is_expected.to contain_tempest_config('service_available/gnocchi').with(:value => false)
           is_expected.to contain_tempest_config('service_available/horizon').with(:value => true)
           is_expected.to contain_tempest_config('service_available/neutron').with(:value => true)
           is_expected.to contain_tempest_config('service_available/nova').with(:value => true)