diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp
index 04b3ccac..cf9a0be1 100644
--- a/manifests/candlepin.pp
+++ b/manifests/candlepin.pp
@@ -78,8 +78,6 @@
   $client_key = "${pki_dir}/private/${java_client_cert_name}.key"
 
   if $deploy {
-    include ::certs::ssltools::nssdb
-
     certs::keypair { 'tomcat':
       key_pair  => $tomcat_cert_name,
       key_file  => $tomcat_key,
@@ -101,12 +99,6 @@
       key_file  => $client_key,
       cert_file => $client_cert,
     } ~>
-    certs::ssltools::certutil { 'amqp-client':
-      nss_db_dir  => $nss_db_dir,
-      client_cert => $client_cert,
-      refreshonly => true,
-      subscribe   => Exec['create-nss-db'],
-    } ~>
     file { $amqp_store_dir:
       ensure => directory,
       owner  => 'tomcat',
diff --git a/spec/acceptance/candlepin_spec.rb b/spec/acceptance/candlepin_spec.rb
index 95029aa7..78d13d3b 100644
--- a/spec/acceptance/candlepin_spec.rb
+++ b/spec/acceptance/candlepin_spec.rb
@@ -21,10 +21,6 @@
         ensure => present,
       }
 
-      group { 'qpidd':
-        ensure => present,
-      }
-
       ['/usr/share/tomcat/conf', '/etc/candlepin/certs/amqp'].each |$dir| {
         exec { "mkdir -p ${dir}":
           creates => $dir,