diff --git a/docker/services/tempest.yaml b/docker/services/tempest.yaml
new file mode 100644
index 0000000000..18f9c7fd05
--- /dev/null
+++ b/docker/services/tempest.yaml
@@ -0,0 +1,55 @@
+heat_template_version: queens
+
+description: >
+  OpenStack containerized Tempest
+
+parameters:
+  DockerTempestImage:
+    description: image
+    type: string
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  UpgradeRemoveUnusedPackages:
+    default: false
+    description: Remove package if the service is being disabled during upgrade
+    type: boolean
+
+outputs:
+  role_data:
+    description: Role data for the tempest service
+    value:
+      # It just adds a fake tempest service so that it will be
+      # available on undercloud.
+      service_name: tempest
+      docker_config:
+        volumes: ''
+      host_prep_tasks: {}
+      puppet_config:
+        config_volume: ''
+        step_config: ''
+        config_image: {get_param: DockerTempestImage}
+      config_settings: {}
diff --git a/environments/enable_tempest.yaml b/environments/enable_tempest.yaml
new file mode 100644
index 0000000000..87ee94a62b
--- /dev/null
+++ b/environments/enable_tempest.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  OS::TripleO::Services::Tempest: ../puppet/services/tempest.yaml
diff --git a/environments/services-docker/tempest.yaml b/environments/services-docker/tempest.yaml
new file mode 100644
index 0000000000..7e1efbe99f
--- /dev/null
+++ b/environments/services-docker/tempest.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  OS::TripleO::Services::Tempest: ../../docker/services/tempest.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index e6c12a389d..b88292a35f 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -351,6 +351,9 @@ resource_registry:
   OS::TripleO::Services::Logging::NovaPlacement: docker/services/logging/files/nova-placement.yaml
   OS::TripleO::Services::Logging::PankoApi: docker/services/logging/files/panko-api.yaml
 
+  # Tempest
+  OS::TripleO::Services::Tempest: OS::Heat::None
+
 parameter_defaults:
   EnablePackageInstall: false
   SoftwareConfigTransport: POLL_TEMP_URL
diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml
index 5dbc8d1c94..c3085f4f75 100644
--- a/roles/Undercloud.yaml
+++ b/roles/Undercloud.yaml
@@ -72,3 +72,4 @@
     - OS::TripleO::Services::UndercloudHAProxy
     - OS::TripleO::Services::UndercloudKeepalived
     - OS::TripleO::Services::Zaqar
+    - OS::TripleO::Services::Tempest
diff --git a/roles/UndercloudLight.yaml b/roles/UndercloudLight.yaml
index d75f8ab231..1a91f87c2e 100644
--- a/roles/UndercloudLight.yaml
+++ b/roles/UndercloudLight.yaml
@@ -35,3 +35,4 @@
     - OS::TripleO::Services::SwiftRingBuilder
     - OS::TripleO::Services::SwiftStorage
     - OS::TripleO::Services::Zaqar
+    - OS::TripleO::Services::Tempest
diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml
index 14823ab3cd..28dc322287 100644
--- a/roles_data_undercloud.yaml
+++ b/roles_data_undercloud.yaml
@@ -75,4 +75,5 @@
     - OS::TripleO::Services::UndercloudHAProxy
     - OS::TripleO::Services::UndercloudKeepalived
     - OS::TripleO::Services::Zaqar
+    - OS::TripleO::Services::Tempest