diff --git a/manifests/application.pp b/manifests/application.pp
index acf6840d..b26c7874 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -14,12 +14,6 @@
   include certs::pulp_client
   include katello::params
 
-  include certs::qpid
-  include katello::qpid_client
-  User<|title == $foreman::user|>{groups +> 'qpidd'}
-
-  Class['certs', 'certs::ca', 'certs::qpid'] ~> Class['foreman::plugin::tasks']
-
   foreman_config_entry { 'pulp_client_cert':
     value          => $certs::pulp_client::client_cert,
     ignore_missing => false,
diff --git a/manifests/qpid_client.pp b/manifests/qpid_client.pp
deleted file mode 100644
index 3f6fc3ee..00000000
--- a/manifests/qpid_client.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# @summary Install and configure a qpid client.
-# @api private
-#
-# This is used by the Katello Rails app to connect to the
-# qpid message broker as well as Pulp
-class katello::qpid_client {
-  include certs
-  include certs::qpid
-
-  class { 'qpid::client':
-    ssl                    => true,
-    ssl_cert_name          => $certs::qpid::nss_cert_name,
-    ssl_cert_db            => $certs::qpid::nss_db_dir,
-    ssl_cert_password_file => $certs::qpid::nss_db_password_file,
-    require                => Class['certs', 'certs::qpid'],
-  }
-
-  contain qpid::client
-}
diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb
index 1020e054..f1cdfb24 100644
--- a/spec/classes/application_spec.rb
+++ b/spec/classes/application_spec.rb
@@ -27,13 +27,6 @@ class { 'katello::params':
           it { is_expected.to create_package('postgresql-evr') }
         end
 
-        it do
-          is_expected.to contain_class('certs::qpid')
-            .that_notifies(['Class[Foreman::Plugin::Tasks]'])
-        end
-
-        it { is_expected.to contain_class('katello::qpid_client') }
-
         it do
           is_expected.to create_foreman_config_entry('pulp_client_cert')
             .with_value('/etc/pki/katello/certs/pulp-client.crt')
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 6c5c259c..9fb374a1 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -8,10 +8,9 @@
       it { is_expected.to compile.with_all_deps }
       it { is_expected.to contain_class('katello::candlepin') }
       it { is_expected.to contain_class('katello::application') }
-      it { is_expected.to contain_class('katello::qpid_client') }
+      it { is_expected.to contain_class('katello::qpid') }
 
       if facts[:operatingsystemmajrelease] == '7'
-        it { is_expected.to contain_class('katello::qpid') }
         it { is_expected.to contain_package('tfm-rubygem-katello').that_requires('Class[candlepin]') }
       else
         it { is_expected.to contain_package('rubygem-katello').that_requires('Class[candlepin]') }
diff --git a/spec/classes/qpid_client_spec.rb b/spec/classes/qpid_client_spec.rb
deleted file mode 100644
index f75aabe0..00000000
--- a/spec/classes/qpid_client_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe 'katello::qpid_client' do
-  on_supported_os.each do |os, os_facts|
-    context "on #{os}" do
-      let(:facts) { os_facts }
-      it { is_expected.to compile.with_all_deps }
-      it { is_expected.to contain_class('certs::qpid') }
-
-      it do
-        is_expected.to create_class('qpid::client')
-          .with_ssl(true)
-          .with_ssl_cert_name('broker')
-          .with_ssl_cert_db('/etc/pki/katello/nssdb')
-          .with_ssl_cert_password_file('/etc/pki/katello/nssdb/nss_db_password-file')
-          .that_requires('Class[Certs::Qpid]')
-      end
-    end
-  end
-end
diff --git a/spec/classes/qpid_spec.rb b/spec/classes/qpid_spec.rb
index 6e53483b..b9c45f5f 100644
--- a/spec/classes/qpid_spec.rb
+++ b/spec/classes/qpid_spec.rb
@@ -5,30 +5,28 @@
     context "on #{os}" do
       let(:facts) { facts }
 
-      if facts[:operatingsystemmajrelease] == '7'
-        context 'with default parameters' do
-          it { is_expected.to compile.with_all_deps }
-          it { is_expected.to contain_class('certs::qpid').that_notifies(['Service[qpidd]', 'Class[qpid]']) }
-          it { is_expected.to create_class('qpid').with_wcache_page_size(4).with_interface('lo') }
-        end
+      context 'with default parameters' do
+        it { is_expected.to compile.with_all_deps }
+        it { is_expected.to contain_class('certs::qpid').that_notifies(['Service[qpidd]', 'Class[qpid]']) }
+        it { is_expected.to create_class('qpid').with_wcache_page_size(4).with_interface('lo') }
+      end
 
-        it do
-          is_expected.to create_qpid__config__queue('katello.agent')
-            .with_ssl_cert('/etc/pki/katello/certs/foo.example.com-qpid-broker.crt')
-            .with_ssl_key('/etc/pki/katello/private/foo.example.com-qpid-broker.key')
-        end
+      it do
+        is_expected.to create_qpid__config__queue('katello.agent')
+          .with_ssl_cert('/etc/pki/katello/certs/foo.example.com-qpid-broker.crt')
+          .with_ssl_key('/etc/pki/katello/private/foo.example.com-qpid-broker.key')
+      end
 
-        context 'with overridden parameters' do
-          let :params do
-            {
-              wcache_page_size: 8,
-            }
-          end
+      context 'with overridden parameters' do
+        let :params do
+          {
+            wcache_page_size: 8,
+          }
+        end
 
-          it 'should pass the variable' do
-            is_expected.to compile.with_all_deps
-            is_expected.to create_class('qpid').with_wcache_page_size(8)
-          end
+        it 'should pass the variable' do
+          is_expected.to compile.with_all_deps
+          is_expected.to create_class('qpid').with_wcache_page_size(8)
         end
       end
     end