diff --git a/dnf-behave-tests/dnf/comps-group.feature b/dnf-behave-tests/dnf/comps-group.feature
index b93037468..4efa23ae0 100644
--- a/dnf-behave-tests/dnf/comps-group.feature
+++ b/dnf-behave-tests/dnf/comps-group.feature
@@ -111,8 +111,7 @@ Scenario: Install installed group when group is not available
         | group-install | DNF-CI-Testgroup                  |
    When I execute dnf with args "group install --disable-repo=dnf-ci-thirdparty dnf-ci-testgroup"
    Then the exit code is 1
-    And dnf4 stderr contains "Module or Group 'dnf-ci-testgroup' is not available."
-    And dnf5 stderr is
+    And stderr contains lines
     """
     Failed to resolve the transaction:
     No match for argument: dnf-ci-testgroup
diff --git a/dnf-behave-tests/dnf/comps-upgrade.feature b/dnf-behave-tests/dnf/comps-upgrade.feature
index 5b8607f39..1ecfb460d 100644
--- a/dnf-behave-tests/dnf/comps-upgrade.feature
+++ b/dnf-behave-tests/dnf/comps-upgrade.feature
@@ -319,7 +319,7 @@ Scenario: Upgrade nonexistent group
    When I execute dnf with args "group upgrade nonexistent"
    Then the exit code is 1
     And Transaction is empty
-    And stderr is
+    And stderr contains lines
         """
         Failed to resolve the transaction:
         No match for argument: nonexistent
diff --git a/dnf-behave-tests/dnf/distro-sync.feature b/dnf-behave-tests/dnf/distro-sync.feature
index a74f9ab5e..4d73ae75c 100644
--- a/dnf-behave-tests/dnf/distro-sync.feature
+++ b/dnf-behave-tests/dnf/distro-sync.feature
@@ -111,6 +111,8 @@ Scenario: distro-sync list of packages, one of them is not available
     """
     Failed to resolve the transaction:
     No match for argument: nosuchpkg
+    You can try to add to command line:
+      --skip-unavailable to skip unavailable packages
     """
     And Transaction is empty
 
diff --git a/dnf-behave-tests/dnf/downgrade.feature b/dnf-behave-tests/dnf/downgrade.feature
index 9f4ca154a..02a90cbdf 100644
--- a/dnf-behave-tests/dnf/downgrade.feature
+++ b/dnf-behave-tests/dnf/downgrade.feature
@@ -110,6 +110,8 @@ Scenario: Downgrade list of packages, one of them is not available
     """
     Failed to resolve the transaction:
     No match for argument: nosuchpkg
+    You can try to add to command line:
+      --skip-unavailable to skip unavailable packages
     """
     And Transaction is empty
 
@@ -170,6 +172,8 @@ Scenario: Downgrade mixture of not available/not installed/not downgradable/down
     No match for argument: nosuchpkg
     The lowest available version of the "wget.x86_64" package is already installed, cannot downgrade it.
     Packages for argument 'abcde' available, but not installed.
+    You can try to add to command line:
+      --skip-unavailable to skip unavailable packages
     """
     And Transaction is empty
 
@@ -201,6 +205,8 @@ Scenario Outline: Check <command> exit code - package does not exist
     """
     Failed to resolve the transaction:
     No match for argument: non-existent-package
+    You can try to add to command line:
+      --skip-unavailable to skip unavailable packages
     """
 
 Examples:
diff --git a/dnf-behave-tests/dnf/download-binary.feature b/dnf-behave-tests/dnf/download-binary.feature
index e724888ba..16c553608 100644
--- a/dnf-behave-tests/dnf/download-binary.feature
+++ b/dnf-behave-tests/dnf/download-binary.feature
@@ -38,14 +38,14 @@ Scenario: Download an existing RPM with dependencies
 @bz1844925
 Scenario: Error when failed to resolve dependencies
    When I execute dnf with args "download filesystem --resolve --exclude setup"
-   Then the exit code is 1
-    And stderr is
+    Then stderr is
         """
         Failed to resolve the transaction:
         Problem: package filesystem-3.9-2.fc29.x86_64 requires setup, but none of the providers can be installed
           - conflicting requests
           - package setup-2.12.1-1.fc29.noarch is filtered out by exclude filtering
         """
+   Then the exit code is 1
 
 
 Scenario: Download an existing RPM with dependencies into a --destdir
diff --git a/dnf-behave-tests/dnf/install-exclude.feature b/dnf-behave-tests/dnf/install-exclude.feature
index 067588774..3e9b7d5a4 100644
--- a/dnf-behave-tests/dnf/install-exclude.feature
+++ b/dnf-behave-tests/dnf/install-exclude.feature
@@ -21,6 +21,8 @@ Scenario: Install an RPM that requires excluded RPM
     Problem: package filesystem-3.9-2.fc29.x86_64 requires setup, but none of the providers can be installed
       - conflicting requests
       - package setup-2.12.1-1.fc29.noarch is filtered out by exclude filtering
+    You can try to add to command line:
+      --skip-broken to skip uninstallable packages
     """
 
 
diff --git a/dnf-behave-tests/dnf/install-non-existent.feature b/dnf-behave-tests/dnf/install-non-existent.feature
index 486ab24b4..4d2cd9eda 100644
--- a/dnf-behave-tests/dnf/install-non-existent.feature
+++ b/dnf-behave-tests/dnf/install-non-existent.feature
@@ -21,6 +21,8 @@ Scenario: Try to install a non-existent package
     """
     Failed to resolve the transaction:
     No match for argument: non-existent-package
+    You can try to add to command line:
+      --skip-unavailable to skip unavailable packages
     """
 
 
@@ -33,6 +35,8 @@ Scenario: Install an existent and an non-existent package
     """
     Failed to resolve the transaction:
     No match for argument: non-existent-package
+    You can try to add to command line:
+      --skip-unavailable to skip unavailable packages
     """
 
 
diff --git a/dnf-behave-tests/dnf/mark.feature b/dnf-behave-tests/dnf/mark.feature
index b0f2c492c..ce10a8556 100644
--- a/dnf-behave-tests/dnf/mark.feature
+++ b/dnf-behave-tests/dnf/mark.feature
@@ -6,7 +6,7 @@ Scenario Outline: Marking non-existent package as <type> fails
   Given I use repository "dnf-ci-fedora"
    When I execute dnf with args "mark <type> nosuchpkg"
    Then the exit code is 1
-    And stderr is
+    And stderr contains lines
     """
     Failed to resolve the transaction:
     No match for argument: nosuchpkg
@@ -33,7 +33,7 @@ Scenario: Marking as group for non-existent package or non-existent group fails
    When I execute dnf with args "install lame"
     And I execute dnf with args "mark group nosuchgrp lame"
    Then the exit code is 1
-    And stderr is
+    And stderr contains lines
     """
     Group state for "nosuchgrp" not found.
     """
@@ -44,7 +44,7 @@ Scenario: Marking available but not installed package fails
   Given I use repository "dnf-ci-fedora"
    When I execute dnf with args "mark user lame"
    Then the exit code is 1
-    And stderr is
+    And stderr contains lines
     """
     Failed to resolve the transaction:
     No match for argument: lame
@@ -60,7 +60,7 @@ Scenario: Marking as dependency a list of pkgs when one of them is not available
     And package reasons are
         | Package                      | Reason  |
         | lame-3.100-4.fc29.x86_64     | user    |
-    And stderr is
+    And stderr contains lines
     """
     Failed to resolve the transaction:
     No match for argument: nosuchpkg
diff --git a/dnf-behave-tests/dnf/obsoletes.feature b/dnf-behave-tests/dnf/obsoletes.feature
index 0a4a90d10..3d950f10d 100644
--- a/dnf-behave-tests/dnf/obsoletes.feature
+++ b/dnf-behave-tests/dnf/obsoletes.feature
@@ -305,17 +305,13 @@ Scenario: Obsoleted package is not installed when group contains both obsoleter
 Scenario: Both packages are installed when group contains both obsoleter and obsoleted packages and obsoletes are switched off
    When I execute dnf with args "group install obsoleter-obsoleted --setopt=obsoletes=False"
    Then the exit code is 1
-    And dnf4 stderr is
-    """
-    Error:
-     Problem: package PackageD-2.0-1.x86_64 obsoletes PackageC < 2.0 provided by PackageC-1.0-1.x86_64
-      - cannot install the best candidate for the job
-      - conflicting requests
-    """
-    And dnf5 stderr is
+    And stderr is
     """
     Failed to resolve the transaction:
     Problem: package PackageD-2.0-1.x86_64 obsoletes PackageC < 2.0 provided by PackageC-1.0-1.x86_64
       - cannot install the best candidate for the job
       - conflicting requests
+    You can try to add to command line:
+      --no-best to not limit the transaction to the best candidates
+      --skip-broken to skip uninstallable packages
     """
diff --git a/dnf-behave-tests/dnf/plugins-core/builddep.feature b/dnf-behave-tests/dnf/plugins-core/builddep.feature
index 9fc61cccf..4809a545b 100644
--- a/dnf-behave-tests/dnf/plugins-core/builddep.feature
+++ b/dnf-behave-tests/dnf/plugins-core/builddep.feature
@@ -87,6 +87,8 @@ Scenario: Builddep with simple dependency (non-existent)
       """
       Failed to resolve the transaction:
       No match for argument: flac = 15
+      You can try to add to command line:
+        --skip-unavailable to skip unavailable packages
       """
 
 @dnf5
@@ -152,16 +154,12 @@ Scenario: Builddep with unavailable build dependency
     Given I use repository "dnf-ci-fedora"
      When I execute dnf with args "builddep {context.dnf.fixturesdir}/repos/dnf-ci-builddep/src/unavailable-requirement-1.0-1.src.rpm"
      Then the exit code is 1
-      And dnf4 stderr is
-      """
-      No matching package to install: 'this-lib-is-not-available'
-      Not all dependencies satisfied
-      Error: Some packages could not be found.
-      """
-      And dnf5 stderr is
+      And stderr is
       """
       Failed to resolve the transaction:
       No match for argument: this-lib-is-not-available
+      You can try to add to command line:
+        --skip-unavailable to skip unavailable packages
       """
      When I execute dnf with args "builddep --skip-unavailable {context.dnf.fixturesdir}/repos/dnf-ci-builddep/src/unavailable-requirement-1.0-1.src.rpm"
      Then the exit code is 0
diff --git a/dnf-behave-tests/dnf/protect-running-kernel.feature b/dnf-behave-tests/dnf/protect-running-kernel.feature
index 75c401d45..e3b63ba6d 100644
--- a/dnf-behave-tests/dnf/protect-running-kernel.feature
+++ b/dnf-behave-tests/dnf/protect-running-kernel.feature
@@ -48,6 +48,8 @@ Scenario: Running kernel is protected against obsoleting
         """
         Failed to resolve the transaction:
         Problem: The operation would result in removing of running kernel: dnf-ci-kernel-0:1.0-1.x86_64
+        You can try to add to command line:
+          --skip-broken to skip uninstallable packages
         """
 
 
@@ -71,6 +73,8 @@ Scenario: Running kernel is protected against removal as conflict
         Problem: problem with installed package 
           - package dnf-ci-conflict-1.0-1.x86_64 conflicts with dnf-ci-kernel = 1.0-1 provided by dnf-ci-kernel-1.0-1.x86_64
           - conflicting requests
+        You can try to add to command line:
+          --skip-broken to skip uninstallable packages
         """
 
 @bz1698145
diff --git a/dnf-behave-tests/dnf/reinstall.feature b/dnf-behave-tests/dnf/reinstall.feature
index 9898aeafc..3bc579694 100644
--- a/dnf-behave-tests/dnf/reinstall.feature
+++ b/dnf-behave-tests/dnf/reinstall.feature
@@ -60,6 +60,8 @@ Scenario: Reinstall list of packages, one of them is not available
     """
     Failed to resolve the transaction:
     No match for argument: nosuchpkg
+    You can try to add to command line:
+      --skip-unavailable to skip unavailable packages
     """
     And Transaction is empty
 
diff --git a/dnf-behave-tests/dnf/security-upgrade.feature b/dnf-behave-tests/dnf/security-upgrade.feature
index 36e0b21cd..c762e3d3b 100644
--- a/dnf-behave-tests/dnf/security-upgrade.feature
+++ b/dnf-behave-tests/dnf/security-upgrade.feature
@@ -32,21 +32,15 @@ Given I use repository "security-upgrade-noarch"
       | install       | json-c-0:1-1.x86_64         |
  When I execute dnf with args "upgrade --security"
  Then the exit code is 1
- And dnf4 stderr is
- """
- Error: 
-  Problem: cannot install both json-c-2-2.x86_64 and json-c-2-2.noarch
-   - package bind-libs-lite-2-2.x86_64 requires libjson-c.so.4()(64bit), but none of the providers can be installed
-   - cannot install the best update candidate for package json-c-1-1.x86_64
-   - cannot install the best update candidate for package bind-libs-lite-1-1.x86_64
- """
- And dnf5 stderr is
+ And stderr is
  """
  Failed to resolve the transaction:
  Problem: cannot install both json-c-2-2.noarch and json-c-2-2.x86_64
    - package bind-libs-lite-2-2.x86_64 requires libjson-c.so.4()(64bit), but none of the providers can be installed
    - cannot install the best update candidate for package json-c-1-1.x86_64
    - cannot install the best update candidate for package bind-libs-lite-1-1.x86_64
+ You can try to add to command line:
+   --no-best to not limit the transaction to the best candidates
  """
 
 
diff --git a/dnf-behave-tests/dnf/upgrade.feature b/dnf-behave-tests/dnf/upgrade.feature
index 582006016..30641cda2 100644
--- a/dnf-behave-tests/dnf/upgrade.feature
+++ b/dnf-behave-tests/dnf/upgrade.feature
@@ -68,6 +68,8 @@ Scenario: Upgrade list of packages, one of them is not available
     """
     Failed to resolve the transaction:
     No match for argument: nosuchpkg
+    You can try to add to command line:
+      --skip-unavailable to skip unavailable packages
     """
     And Transaction is empty
 
@@ -164,6 +166,8 @@ Scenario: Upgrade all RPMs from multiple repositories with best=True
     Failed to resolve the transaction:
     Problem: cannot install the best update candidate for package SuperRipper-1.0-1.x86_64
       - nothing provides unsatisfiable needed by SuperRipper-1.3-1.x86_64
+    You can try to add to command line:
+      --no-best to not limit the transaction to the best candidates
     """
    When I execute dnf with args "upgrade --no-best"
    Then the exit code is 0