diff --git a/spec/acceptance/basic_magnum_spec.rb b/spec/acceptance/basic_magnum_spec.rb
index 247f38e..1b61eaa 100755
--- a/spec/acceptance/basic_magnum_spec.rb
+++ b/spec/acceptance/basic_magnum_spec.rb
@@ -8,76 +8,15 @@ describe 'basic magnum' do
       pp= <<-EOS
       include openstack_integration
       include openstack_integration::repos
+      include openstack_integration::apache
       include openstack_integration::rabbitmq
       include openstack_integration::mysql
       include openstack_integration::keystone
 
-      rabbitmq_vhost { '/magnum':
-        provider => 'rabbitmqctl',
-        require  => Class['rabbitmq'],
-      }
-      rabbitmq_user { 'magnum':
-        admin    => true,
-        password => 'an_even_bigger_secret',
-        provider => 'rabbitmqctl',
-        require  => Class['rabbitmq'],
-      }
-      rabbitmq_user_permissions { 'magnum@/':
-        configure_permission => '.*',
-        write_permission     => '.*',
-        read_permission      => '.*',
-        provider             => 'rabbitmqctl',
-        require              => Class['rabbitmq'],
-      }
-
-      # Magnum resources
-      class { 'magnum::keystone::auth':
-        password     => 'a_big_secret',
-        public_url   => 'http://127.0.0.1:9511/v1',
-        internal_url => 'http://127.0.0.1:9511/v1',
-        admin_url    => 'http://127.0.0.1:9511/v1',
-      }
-
-      class { 'magnum::keystone::authtoken':
-        password => 'a_big_secret',
-      }
-
-      class { 'magnum::db::mysql':
-        password => 'magnum',
-      }
-
-      class { 'magnum::logging':
-        debug => true,
-      }
-
-      class { 'magnum::db':
-        database_connection => 'mysql://magnum:magnum@127.0.0.1/magnum',
-      }
-
-      class { 'magnum::keystone::domain':
-        domain_password => 'oh_my_no_secret',
-      }
-
-      class { 'magnum':
-        default_transport_url => 'rabbit://magnum:an_even_bigger_secret@127.0.0.1:5672/',
-        rabbit_use_ssl        => false,
-        notification_driver   => 'messagingv2',
-      }
-
-      class { 'magnum::api':
-        service_name => 'httpd',
-      }
-      include apache
-      include magnum::wsgi::apache
-
-      class { 'magnum::conductor': }
-      class { 'magnum::client': }
-
-      class { 'magnum::certificates':
+      class { 'openstack_integration::magnum':
         cert_manager_type => 'local'
       }
 
-      class { 'magnum::clients': }
     EOS
       # Run it twice to test for idempotency
       apply_manifest(pp, :catch_failures => true)
@@ -85,7 +24,7 @@ describe 'basic magnum' do
     end
 
     describe port(9511) do
-      it { is_expected.to be_listening.with('tcp6') }
+      it { is_expected.to be_listening }
     end
 
   end