diff --git a/spec/acceptance/watcher_wsgi_apache_spec.rb b/spec/acceptance/watcher_wsgi_apache_spec.rb
index 01c291a..2a197f3 100644
--- a/spec/acceptance/watcher_wsgi_apache_spec.rb
+++ b/spec/acceptance/watcher_wsgi_apache_spec.rb
@@ -12,58 +12,10 @@ describe 'basic watcher' do
       include ::openstack_integration::mysql
       include ::openstack_integration::keystone
 
-      rabbitmq_user { 'watcher':
-        admin    => true,
-        password => 'my_secret',
-        provider => 'rabbitmqctl',
-        require  => Class['rabbitmq'],
-      }
-
-      rabbitmq_user_permissions { 'watcher@/':
-        configure_permission => '.*',
-        write_permission     => '.*',
-        read_permission      => '.*',
-        provider             => 'rabbitmqctl',
-        require              => Class['rabbitmq'],
-      }
-
       # TODO(aschultz): fix after Ubuntu ocata-m3/rc1. watcher-db-manage is
       # broken
       if ($::osfamily == 'RedHat') {
-        class { '::watcher::db::mysql':
-          password => 'a_big_secret',
-        }
-        class { '::watcher::db':
-          database_connection => 'mysql+pymysql://watcher:a_big_secret@127.0.0.1/watcher?charset=utf8',
-        }
-        class { '::watcher::keystone::auth':
-          password => 'a_big_secret',
-        }
-        class { '::watcher::keystone::authtoken':
-          password => 'a_big_secret',
-        }
-        class { '::watcher::logging':
-          debug => true,
-        }
-        class { '::watcher':
-          default_transport_url => 'rabbit://watcher:my_secret@127.0.0.1:5672/',
-        }
-        class { '::watcher::api':
-          service_name            => 'httpd',
-          watcher_client_password => 'a_big_secret',
-          create_db_schema        => true,
-          upgrade_db              => true,
-        }
-        include ::apache
-        class { '::watcher::wsgi::apache':
-          ssl => false,
-        }
-        class { '::watcher::applier':
-          applier_workers => '2',
-        }
-        class { '::watcher::decision_engine':
-          decision_engine_workers => '2',
-        }
+        include ::openstack_integration::watcher
       }
       EOS