diff --git a/tests/foreman/cli/test_hammer.py b/tests/foreman/cli/test_hammer.py
index c795352c5ed..aa3bfcf4aeb 100644
--- a/tests/foreman/cli/test_hammer.py
+++ b/tests/foreman/cli/test_hammer.py
@@ -136,6 +136,13 @@ def test_positive_disable_hammer_defaults(request, function_product, target_sat)
 
     :BZ: 1640644, 1368173
     """
+
+    @request.addfinalizer
+    def _finalize():
+        target_sat.cli.Defaults.delete({'param-name': 'organization_id'})
+        result = target_sat.execute('hammer defaults list')
+        assert str(function_product.organization.id) not in result.stdout
+
     target_sat.cli.Defaults.add(
         {'param-name': 'organization_id', 'param-value': function_product.organization.id}
     )
@@ -154,12 +161,6 @@ def test_positive_disable_hammer_defaults(request, function_product, target_sat)
     assert result.status == 0
     assert function_product.name in result.stdout
 
-    @request.addfinalizer
-    def _finalize():
-        target_sat.cli.Defaults.delete({'param-name': 'organization_id'})
-        result = target_sat.execute('hammer defaults list')
-        assert str(function_product.organization.id) not in result.stdout
-
 
 @pytest.mark.upgrade
 def test_positive_check_debug_log_levels(target_sat):