diff --git a/tests/data/client.conf b/tests/data/client.conf
index 1ce23ca7..0dc1aefd 100644
--- a/tests/data/client.conf
+++ b/tests/data/client.conf
@@ -1,14 +1,10 @@
 from dummy-pungi import *
 
+release_short = "Client"
+
 tree_variants = ["Client"]
 pkgset_repos = {
-    "i386": [
-        "{{configdir}}/repo",
-    ],
-    "x86_64": [
-        "{{configdir}}/repo",
-    ],
-    "s390x": [
+    "*": [
         "{{configdir}}/repo",
     ],
 }
diff --git a/tests/data/dummy-pungi.conf b/tests/data/dummy-pungi.conf
index 120c44f1..7644539c 100644
--- a/tests/data/dummy-pungi.conf
+++ b/tests/data/dummy-pungi.conf
@@ -19,13 +19,7 @@ runroot = False
 sigkeys = [None]
 pkgset_source = "repos"
 pkgset_repos = {
-    "i386": [
-        "repo",
-    ],
-    "x86_64": [
-        "repo",
-    ],
-    "s390x": [
+    "*": [
         "repo",
     ],
 }
diff --git a/tests/data/resilient-storage.conf b/tests/data/resilient-storage.conf
index b414f875..4812d967 100644
--- a/tests/data/resilient-storage.conf
+++ b/tests/data/resilient-storage.conf
@@ -1,15 +1,19 @@
 from dummy-pungi import *
 
+release_short = "ResilientStorage"
+
 tree_variants = ["ResilientStorage"]
 variants_file = "multi-compose-variants.xml"
 pkgset_repos = {
-    "i386": [
-        "{{configdir}}/repo",
-    ],
-    "x86_64": [
-        "{{configdir}}/repo",
-    ],
-    "s390x": [
-        "{{configdir}}/repo",
+    "*": [
+        "{{configdir}}/repo/",
     ],
 }
+gather_lookaside_repos = [
+    ('^ResilientStorage$', {
+        '*': [
+            "{{part-server}}/compose/Server/$basearch/os",
+            "{{part-server}}/compose/Server/source/tree",
+        ]
+    })
+]
diff --git a/tests/data/server.conf b/tests/data/server.conf
index cec3e3fb..12fbbc59 100644
--- a/tests/data/server.conf
+++ b/tests/data/server.conf
@@ -1,15 +1,11 @@
 from dummy-pungi import *
 
+release_short = "Server"
+
 tree_variants = ["Server"]
 variants_file = "multi-compose-variants.xml"
 pkgset_repos = {
-    "i386": [
-        "{{configdir}}/repo",
-    ],
-    "x86_64": [
-        "{{configdir}}/repo",
-    ],
-    "s390x": [
+    "*": [
         "{{configdir}}/repo",
     ],
 }