diff --git a/tests/foreman/cli/test_hammer.py b/tests/foreman/cli/test_hammer.py
index ac4476dc66b..7a6f1d3f7ed 100644
--- a/tests/foreman/cli/test_hammer.py
+++ b/tests/foreman/cli/test_hammer.py
@@ -30,7 +30,7 @@
 
 HAMMER_COMMANDS = json.loads(DataFile.HAMMER_COMMANDS_JSON.read_text())
 
-pytestmark = [pytest.mark.tier1, pytest.mark.upgrade, pytest.mark.e2e]
+pytestmark = [pytest.mark.tier1]
 
 
 def fetch_command_info(command):
@@ -127,6 +127,7 @@ def test_positive_all_options(target_sat):
         pytest.fail(format_commands_diff(differences))
 
 
+@pytest.mark.upgrade
 def test_positive_disable_hammer_defaults(request, function_product, target_sat):
     """Verify hammer disable defaults command.
 
@@ -166,6 +167,7 @@ def _finalize():
         assert str(function_product.organization.id) not in result.stdout
 
 
+@pytest.mark.upgrade
 def test_positive_check_debug_log_levels(target_sat):
     """Enabling debug log level in candlepin via hammer logging
 
@@ -192,6 +194,8 @@ def test_positive_check_debug_log_levels(target_sat):
     assert 'log4j.logger.org.candlepin = WARN' in result.stdout
 
 
+@pytest.mark.e2e
+@pytest.mark.upgrade
 def test_positive_hammer_shell(target_sat):
     """Verify that hammer shell runs a command when input is provided via interactive/bash