diff --git a/job_groups/opensuse_tumbleweed.yaml b/job_groups/opensuse_tumbleweed.yaml
index 4b4bd95..ec48e07 100644
--- a/job_groups/opensuse_tumbleweed.yaml
+++ b/job_groups/opensuse_tumbleweed.yaml
@@ -298,7 +298,11 @@ scenarios:
           testsuite: extra_tests_textmode_containers
           settings:
             CONTAINER_RUNTIMES: 'podman'
-            PODMAN_BATS_SKIP: '120-load 125-import 250-systemd 255-auto-update 520-checkpoint'
+            PODMAN_BATS_SKIP: '125-import'
+            PODMAN_BATS_SKIP_ROOT_LOCAL: '120-load 250-systemd 255-auto-update 520-checkpoint'
+            PODMAN_BATS_SKIP_ROOT_REMOTE: '520-checkpoint'
+            PODMAN_BATS_SKIP_USER_LOCAL: '250-systemd 255-auto-update'
+            PODMAN_BATS_SKIP_USER_REMOTE: 'none'
       - containers_host_containerd:
           testsuite: extra_tests_textmode_containers
           settings:
diff --git a/job_groups/opensuse_tumbleweed_aarch64.yaml b/job_groups/opensuse_tumbleweed_aarch64.yaml
index c4766b7..fea8947 100644
--- a/job_groups/opensuse_tumbleweed_aarch64.yaml
+++ b/job_groups/opensuse_tumbleweed_aarch64.yaml
@@ -261,7 +261,11 @@ scenarios:
           testsuite: extra_tests_textmode_containers
           settings:
             CONTAINER_RUNTIMES: 'podman'
-            PODMAN_BATS_SKIP: '120-load 125-import 250-systemd 255-auto-update 520-checkpoint'
+            PODMAN_BATS_SKIP: '125-import'
+            PODMAN_BATS_SKIP_ROOT_LOCAL: '120-load 250-systemd 255-auto-update 520-checkpoint'
+            PODMAN_BATS_SKIP_ROOT_REMOTE: '520-checkpoint'
+            PODMAN_BATS_SKIP_USER_LOCAL: '250-systemd 255-auto-update'
+            PODMAN_BATS_SKIP_USER_REMOTE: 'none'
       - containers_host_containerd:
           testsuite: extra_tests_textmode_containers
           settings: