diff --git a/tests/feature/foreman/base_test.py b/tests/feature/foreman/base_test.py
index 1131458eb..839e31c17 100644
--- a/tests/feature/foreman/base_test.py
+++ b/tests/feature/foreman/base_test.py
@@ -45,6 +45,7 @@ def test_foreman_status_cache(foreman_status):
     assert foreman_status['results']['foreman']['cache']['servers'][0]['status'] == 'ok'
 
 
+@pytest.mark.feature('katello')
 @pytest.mark.parametrize("katello_service", ['candlepin', 'candlepin_auth', 'foreman_tasks', 'katello_events', 'pulp3', 'pulp3_content'])
 def test_katello_services_status(foreman_status, katello_service):
     assert foreman_status['results']['katello']['services'][katello_service]['status'] == 'ok'
diff --git a/tests/candlepin_test.py b/tests/feature/katello/candlepin_test.py
similarity index 97%
rename from tests/candlepin_test.py
rename to tests/feature/katello/candlepin_test.py
index 00065e4ea..85a0dd4d0 100644
--- a/tests/candlepin_test.py
+++ b/tests/feature/katello/candlepin_test.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature('katello')
-
-
 def assert_secret_content(server, secret_name, secret_value):
     secret = server.run(f'podman secret inspect --format {"{{.SecretData}}"} --showsecret {secret_name}')
     assert secret.succeeded