diff --git a/dnf-behave-tests/dnf/clean-cachefiles.feature b/dnf-behave-tests/dnf/clean-cachefiles.feature
index 9b6c3704c..6a0311437 100644
--- a/dnf-behave-tests/dnf/clean-cachefiles.feature
+++ b/dnf-behave-tests/dnf/clean-cachefiles.feature
@@ -1,4 +1,5 @@
 @dnf5
+@dnf5daemon
 Feature: Testing that dnf clean command removes files from the cache
 
 
@@ -27,7 +28,8 @@ Background: Fill the cache
 
 Scenario: Cleanup of the whole cache (dnf clean all)
    When I execute dnf with args "clean all"
-    And I execute "find | sort" in "{context.dnf.installroot}/var/cache/dnf"
+   Then the exit code is 0
+   When I execute "find | sort" in "{context.dnf.installroot}/var/cache/dnf"
    Then stdout matches line by line
    """
    \.
@@ -36,7 +38,8 @@ Scenario: Cleanup of the whole cache (dnf clean all)
 
 Scenario: Cached metadata cleanup (dnf clean metadata)
    When I execute dnf with args "clean metadata"
-    And I execute "find | sort" in "{context.dnf.installroot}/var/cache/dnf"
+   Then the exit code is 0
+   When I execute "find | sort" in "{context.dnf.installroot}/var/cache/dnf"
    Then stdout matches line by line
    """
    \.
@@ -48,7 +51,8 @@ Scenario: Cached metadata cleanup (dnf clean metadata)
 
 Scenario: Cached packages cleanup (dnf clean packages)
    When I execute dnf with args "clean packages"
-    And I execute "find | sort" in "{context.dnf.installroot}/var/cache/dnf"
+   Then the exit code is 0
+   When I execute "find | sort" in "{context.dnf.installroot}/var/cache/dnf"
    Then stdout matches line by line
    """
    \.
@@ -63,7 +67,8 @@ Scenario: Cached packages cleanup (dnf clean packages)
 
 Scenario: Database cached cleanup (dnf clean dbcache)
    When I execute dnf with args "clean dbcache"
-    And I execute "find | sort" in "{context.dnf.installroot}/var/cache/dnf"
+   Then the exit code is 0
+   When I execute "find | sort" in "{context.dnf.installroot}/var/cache/dnf"
    Then stdout matches line by line
    """
    \.
diff --git a/dnf-behave-tests/dnf/clean.feature b/dnf-behave-tests/dnf/clean.feature
index 5524c9a8a..658675d1d 100644
--- a/dnf-behave-tests/dnf/clean.feature
+++ b/dnf-behave-tests/dnf/clean.feature
@@ -1,7 +1,7 @@
+@dnf5
 Feature: Testing dnf clean command
 
 
-@dnf5
 Scenario: Ensure that metadata are unavailable after "dnf clean all"
   Given I use repository "dnf-ci-rich"
    When I execute dnf with args "makecache"
@@ -28,8 +28,8 @@ Scenario: Ensure that metadata are unavailable after "dnf clean all"
         """
 
 
-@dnf5
 @tier1
+@dnf5daemon
 Scenario: Expire dnf cache and run repoquery for a package that has been removed meanwhile
   Given I copy repository "dnf-ci-thirdparty-updates" for modification
     And I use repository "dnf-ci-thirdparty-updates"
@@ -70,8 +70,8 @@ Scenario: Expire dnf cache and run repoquery for a package that has been removed
         """
 
 
-@dnf5
 @tier1
+@dnf5daemon
 Scenario: Expire dnf cache and run repoquery when a package has been removed meanwhile
   Given I copy repository "dnf-ci-thirdparty-updates" for modification
     And I use repository "dnf-ci-thirdparty-updates"