diff --git a/README.md b/README.md
index 028803d61..09f666cbf 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ scenario](#all-in-one).
 | ironic     |             |       X     |             |             |              |
 | zaqar      |             |       X     |             |             |              |
 | murano     |             |             |       X     |             |              |
+| mistral    |             |             |       X     |             |              |
 | barbican   |             |       X     |             |             |              |
 | ceph       |      X      |             |             |      X      |              |
 | ceph rgw   |             |             |             |      X      |              |
diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index 8c35de38f..a0ab490a5 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -24,8 +24,7 @@ case $::osfamily {
   }
   'RedHat': {
     $ipv6            = true
-    # enable when we figure why mistral tempest tests are so unstable
-    $mistral_enabled = false
+    $mistral_enabled = true
     $murano_enabled  = true
   }
   default: {
@@ -68,8 +67,6 @@ include ::openstack_integration::nova
 include ::openstack_integration::trove
 include ::openstack_integration::horizon
 include ::openstack_integration::heat
-# enable when we figure why mistral tempest tests are so unstable
-# include ::openstack_integration::mistral
 include ::openstack_integration::sahara
 if $designate_enabled {
   include ::openstack_integration::designate
@@ -77,6 +74,9 @@ if $designate_enabled {
 if $murano_enabled {
   include ::openstack_integration::murano
 }
+if $mistral_enabled {
+  include ::openstack_integration::mistral
+}
 include ::openstack_integration::provision
 
 class { '::openstack_integration::tempest':
diff --git a/manifests/mistral.pp b/manifests/mistral.pp
index 7ca759e45..4df2a710d 100644
--- a/manifests/mistral.pp
+++ b/manifests/mistral.pp
@@ -17,6 +17,7 @@ class openstack_integration::mistral {
     provider             => 'rabbitmqctl',
     require              => Class['rabbitmq'],
   }
+  Rabbitmq_user_permissions['mistral@/'] -> Service<| tag == 'mistral-service' |>
 
   if $::osfamily == 'RedHat' {
     if $::openstack_integration::config::ssl {
diff --git a/run_tests.sh b/run_tests.sh
index ecb41b697..304509da9 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -241,6 +241,11 @@ echo "VolumesBackupsAdminV2Test" >> /tmp/openstack/tempest/test-whitelist.txt
 # Cinder encrypted volumes
 echo "TestEncryptedCinderVolumes" >> /tmp/openstack/tempest/test-whitelist.txt
 
+# Mistral
+# We have to ignore a smoke test because of:
+# https://bugs.launchpad.net/mistral/+bug/1654555
+echo "test_create_and_delete_workflow" >> /tmp/openstack/tempest/test-whitelist.txt
+
 if uses_debs; then
   # TODO(aschultz): check this after ocata-m2 is published for UCA
   # 1) this will disable the lbaas listeners tests for ubuntu only due to flakey
@@ -249,7 +254,7 @@ if uses_debs; then
   # https://review.openstack.org/#/c/389848/ is packaged in UCA/Ocata
   EXCLUDES="--regex=^(?!neutron_lbaas.tests.tempest.v2.api.test_listeners_.*admin.ListenersTestJSON.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v1_notifications.*$).*"
 else
-  EXCLUDES=""
+  EXCLUDES="--regex=^(?!mistral_tempest_tests.tests.api.v2.test_executions.ExecutionTestsV2.test_get_list_executions.*$).*"
 fi
 print_header 'Running Tempest'
 cd /tmp/openstack/tempest