diff --git a/tests/foreman/installer/test_installer.py b/tests/foreman/installer/test_installer.py
index 86b6942638b..0abe50e2500 100644
--- a/tests/foreman/installer/test_installer.py
+++ b/tests/foreman/installer/test_installer.py
@@ -210,7 +210,6 @@
     '--foreman-proxy-content-enable-deb',
     '--foreman-proxy-content-enable-docker',
     '--foreman-proxy-content-enable-file',
-    '--foreman-proxy-content-enable-katello-agent',
     '--foreman-proxy-content-enable-ostree',
     '--foreman-proxy-content-enable-python',
     '--foreman-proxy-content-enable-yum',
@@ -238,17 +237,6 @@
     '--foreman-proxy-content-pulpcore-postgresql-user',
     '--foreman-proxy-content-pulpcore-telemetry',
     '--foreman-proxy-content-pulpcore-worker-count',
-    '--foreman-proxy-content-qpid-router-agent-addr',
-    '--foreman-proxy-content-qpid-router-agent-port',
-    '--foreman-proxy-content-qpid-router-broker-addr',
-    '--foreman-proxy-content-qpid-router-broker-port',
-    '--foreman-proxy-content-qpid-router-hub-addr',
-    '--foreman-proxy-content-qpid-router-hub-port',
-    '--foreman-proxy-content-qpid-router-logging',
-    '--foreman-proxy-content-qpid-router-logging-level',
-    '--foreman-proxy-content-qpid-router-logging-path',
-    '--foreman-proxy-content-qpid-router-ssl-ciphers',
-    '--foreman-proxy-content-qpid-router-ssl-protocols',
     '--foreman-proxy-content-reverse-proxy',
     '--foreman-proxy-content-reverse-proxy-port',
     '--foreman-proxy-dhcp',
@@ -480,13 +468,11 @@
     '--katello-candlepin-db-ssl-ca',
     '--katello-candlepin-db-ssl-verify',
     '--katello-candlepin-db-user',
+    '--katello-candlepin-loggers',
     '--katello-candlepin-manage-db',
     '--katello-candlepin-oauth-key',
     '--katello-candlepin-oauth-secret',
     '--katello-hosts-queue-workers',
-    '--katello-qpid-hostname',
-    '--katello-qpid-interface',
-    '--katello-qpid-wcache-page-size',
     '--katello-rest-client-timeout',
     '--list-scenarios',
     '--log-level',
@@ -797,7 +783,6 @@
     '--reset-foreman-proxy-content-enable-deb',
     '--reset-foreman-proxy-content-enable-docker',
     '--reset-foreman-proxy-content-enable-file',
-    '--reset-foreman-proxy-content-enable-katello-agent',
     '--reset-foreman-proxy-content-enable-ostree',
     '--reset-foreman-proxy-content-enable-python',
     '--reset-foreman-proxy-content-enable-yum',
@@ -825,17 +810,6 @@
     '--reset-foreman-proxy-content-pulpcore-postgresql-user',
     '--reset-foreman-proxy-content-pulpcore-telemetry',
     '--reset-foreman-proxy-content-pulpcore-worker-count',
-    '--reset-foreman-proxy-content-qpid-router-agent-addr',
-    '--reset-foreman-proxy-content-qpid-router-agent-port',
-    '--reset-foreman-proxy-content-qpid-router-broker-addr',
-    '--reset-foreman-proxy-content-qpid-router-broker-port',
-    '--reset-foreman-proxy-content-qpid-router-hub-addr',
-    '--reset-foreman-proxy-content-qpid-router-hub-port',
-    '--reset-foreman-proxy-content-qpid-router-logging',
-    '--reset-foreman-proxy-content-qpid-router-logging-level',
-    '--reset-foreman-proxy-content-qpid-router-logging-path',
-    '--reset-foreman-proxy-content-qpid-router-ssl-ciphers',
-    '--reset-foreman-proxy-content-qpid-router-ssl-protocols',
     '--reset-foreman-proxy-content-reverse-proxy',
     '--reset-foreman-proxy-content-reverse-proxy-port',
     '--reset-foreman-proxy-dhcp',
@@ -1063,13 +1037,11 @@
     '--reset-katello-candlepin-db-ssl-ca',
     '--reset-katello-candlepin-db-ssl-verify',
     '--reset-katello-candlepin-db-user',
+    '--reset-katello-candlepin-loggers',
     '--reset-katello-candlepin-manage-db',
     '--reset-katello-candlepin-oauth-key',
     '--reset-katello-candlepin-oauth-secret',
     '--reset-katello-hosts-queue-workers',
-    '--reset-katello-qpid-hostname',
-    '--reset-katello-qpid-interface',
-    '--reset-katello-qpid-wcache-page-size',
     '--reset-katello-rest-client-timeout',
     '--reset-puppet-additional-settings',
     '--reset-puppet-agent',