diff --git a/README.md b/README.md
index 09f666cbf..142df1f73 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,6 @@ scenario](#all-in-one).
 | ceph       |      X      |             |             |      X      |              |
 | ceph rgw   |             |             |             |      X      |              |
 | mongodb    |             |       X     |             |             |              |
-| watcher    |             |             |             |      X      |              |
 
 When the Jenkins slave is created, the *run_tests.sh* script will executed.
 This script will execute *install_modules.sh* that prepare /etc/puppet/modules
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index aa3c67de9..d16b002c9 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -23,7 +23,9 @@ if $::operatingsystem == 'Ubuntu' {
 } else {
   $ssl_enabled     = true
   $ipv6            = true
-  $watcher_enabled = true
+  # Re-enable Watcher when monascaclient is packaged in RDO and
+  # added to Watcher dependencies.
+  $watcher_enabled = false
 }
 
 include ::openstack_integration