diff --git a/README.md b/README.md
index af99f2a6e..bba23689a 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ scenario](#all-in-one).
 | ceph mds   |             |             |             |      X      |             |              |
 | ceph rgw   |             |             |             |      X      |             |              |
 | vitrage    |      X      |             |             |             |             |              |
-| watcher    |             |             |             |      X      |             |              |
+| watcher    |      X      |             |             |             |             |              |
 | vpnaas     |             |             |             |      X      |      X      |              |
 | taas       |             |             |             |      X      |             |              |
 | bgpvpn-api |             |             |             |      X      |             |              |
diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index 1509eb83b..028c0b331 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -91,6 +91,8 @@ class { 'openstack_integration::gnocchi':
   backend => 'ceph',
 }
 
+include openstack_integration::watcher
+
 class { 'openstack_integration::tempest':
   cinder        => true,
   cinder_backup => true,
@@ -99,5 +101,6 @@ class { 'openstack_integration::tempest':
   aodh          => true,
   heat          => true,
   vitrage       => true,
+  watcher       => true,
   image_format  => 'raw',
 }
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index 685c8a5fd..e2e0fdd9d 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -83,7 +83,6 @@ class { 'openstack_integration::ceph':
 class { 'openstack_integration::horizon':
   octavia_enabled => true
 }
-include openstack_integration::watcher
 class { 'openstack_integration::manila':
   backend => 'cephfsnative'
 }
@@ -98,7 +97,6 @@ class { 'openstack_integration::provision':
 # Glance, nova, neutron are true by default.
 class { 'openstack_integration::tempest':
   horizon             => true,
-  watcher             => true,
   vpnaas              => $vpnaas_enabled,
   taas                => $taas_enabled,
   bgpvpn              => $bgpvpn_enabled,