diff --git a/dnf-behave-tests/dnf/comps-environment-list.feature b/dnf-behave-tests/dnf/comps-environment-list.feature
index ba464ba52..9034ea2fb 100644
--- a/dnf-behave-tests/dnf/comps-environment-list.feature
+++ b/dnf-behave-tests/dnf/comps-environment-list.feature
@@ -1,11 +1,18 @@
-@dnf5daemon
 Feature: Tests for environment list and info commands
 
 
 Background: Enable repo and mark an environment as installed
  Given I use repository "comps-group-list"
-   And I successfully execute dnf with args "group install test-environment"
+   # Create the installed environment manually so the test can be
+   # used by dnf5daemon because it doesn't implement the environment
+   # install command yet.
+   And I create file "/usr/lib/sysimage/libdnf5/environments.toml" with
+       """
+       version = "1.0"
+       [environments]
 
+       test-environment = {groups = [], userinstalled = true}
+       """
 
 # https://github.com/rpm-software-management/dnf5/issues/1502
 @xfail
diff --git a/dnf-behave-tests/dnf/comps-group-list.feature b/dnf-behave-tests/dnf/comps-group-list.feature
index 02bcac3e3..27a073247 100644
--- a/dnf-behave-tests/dnf/comps-group-list.feature
+++ b/dnf-behave-tests/dnf/comps-group-list.feature
@@ -3,7 +3,18 @@ Feature: Tests for group list and info commands
 
 Background: Enable repo and mark a group as installed
  Given I use repository "comps-group-list"
-   And I successfully execute dnf with args "group install test-group"
+ # Create the installed group manually so the test can be
+ # used by dnf5daemon because it doesn't implement the group
+ # install command yet.
+ Given I create file "/usr/lib/sysimage/libdnf5/groups.toml" with
+    """
+    version = "1.0"
+
+    [groups]
+
+    [groups.test-group]
+    userinstalled = true
+    """
 
 Scenario: All user visible groups are listed by default (installed group is not duplicated)
   When I execute dnf with args "group list"