diff --git a/.zuul.yaml b/.zuul.yaml
index a88e8c5d3..319d1dd75 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -17,7 +17,7 @@
 ---
 - job:
     name: unit-test
-    description: Run Toolbox's unit tests declared in Meson
+    description: Run Toolbx's unit tests declared in Meson
     timeout: 1800
     nodeset:
       nodes:
@@ -28,7 +28,7 @@
 
 - job:
     name: unit-test-migration-path-for-coreos-toolbox
-    description: Run Toolbox's unit tests declared in Meson when built with -Dmigration_path_for_coreos_toolbox
+    description: Run Toolbx's unit tests declared in Meson when built with -Dmigration_path_for_coreos_toolbox
     timeout: 600
     nodeset:
       nodes:
@@ -39,7 +39,7 @@
 
 - job:
     name: unit-test-restricted
-    description: Run Toolbox's unit tests declared in Meson in a restricted build environment
+    description: Run Toolbx's unit tests declared in Meson in a restricted build environment
     timeout: 1800
     nodeset:
       nodes:
@@ -50,8 +50,8 @@
 
 - job:
     name: system-test-fedora-rawhide
-    description: Run Toolbox's system tests in Fedora Rawhide
-    timeout: 4800
+    description: Run Toolbx's system tests in Fedora Rawhide
+    timeout: 10800
     nodeset:
       nodes:
         - name: fedora-rawhide
@@ -60,24 +60,24 @@
     run: playbooks/system-test.yaml
 
 - job:
-    name: system-test-fedora-39
-    description: Run Toolbx's system tests in Fedora 39
-    timeout: 3600
+    name: system-test-fedora-40
+    description: Run Toolbx's system tests in Fedora 40
+    timeout: 9000
     nodeset:
       nodes:
-        - name: fedora-39
-          label: cloud-fedora-39
+        - name: fedora-40
+          label: cloud-fedora-40
     pre-run: playbooks/setup-env.yaml
     run: playbooks/system-test.yaml
 
 - job:
-    name: system-test-fedora-38
-    description: Run Toolbx's system tests in Fedora 38
-    timeout: 3600
+    name: system-test-fedora-39
+    description: Run Toolbx's system tests in Fedora 39
+    timeout: 9000
     nodeset:
       nodes:
-        - name: fedora-38
-          label: cloud-fedora-38
+        - name: fedora-39
+          label: cloud-fedora-39
     pre-run: playbooks/setup-env.yaml
     run: playbooks/system-test.yaml
 
@@ -85,21 +85,21 @@
     periodic:
       jobs:
         - system-test-fedora-rawhide
+        - system-test-fedora-40
         - system-test-fedora-39
-        - system-test-fedora-38
     check:
       jobs:
         - unit-test
         - unit-test-migration-path-for-coreos-toolbox
         - unit-test-restricted
         - system-test-fedora-rawhide
+        - system-test-fedora-40
         - system-test-fedora-39
-        - system-test-fedora-38
     gate:
       jobs:
         - unit-test
         - unit-test-migration-path-for-coreos-toolbox
         - unit-test-restricted
         - system-test-fedora-rawhide
+        - system-test-fedora-40
         - system-test-fedora-39
-        - system-test-fedora-38
diff --git a/test/system/101-create.bats b/test/system/101-create.bats
index f0b58f69d..02791673e 100644
--- a/test/system/101-create.bats
+++ b/test/system/101-create.bats
@@ -21,11 +21,11 @@ load 'libs/helpers'
 
 setup() {
   _setup_environment
-  cleanup_containers
+  cleanup_all
 }
 
 teardown() {
-  cleanup_containers
+  cleanup_all
 }
 
 @test "create: Smoke test" {
diff --git a/test/system/103-container.bats b/test/system/103-container.bats
index b339315ea..13c1e0f22 100644
--- a/test/system/103-container.bats
+++ b/test/system/103-container.bats
@@ -21,11 +21,11 @@ load 'libs/helpers'
 
 setup() {
   _setup_environment
-  cleanup_containers
+  cleanup_all
 }
 
 teardown() {
-  cleanup_containers
+  cleanup_all
 }
 
 
diff --git a/test/system/104-run.bats b/test/system/104-run.bats
index b2f3942a3..6f6a51351 100644
--- a/test/system/104-run.bats
+++ b/test/system/104-run.bats
@@ -22,11 +22,13 @@ load 'libs/helpers'
 setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
-  cleanup_containers
+  cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
-  cleanup_containers
+  popd || return 1
+  cleanup_all
 }
 
 @test "run: Smoke test with true(1)" {
diff --git a/test/system/105-enter.bats b/test/system/105-enter.bats
index c05556049..ef1ac76de 100644
--- a/test/system/105-enter.bats
+++ b/test/system/105-enter.bats
@@ -21,11 +21,11 @@ load 'libs/helpers'
 
 setup() {
   _setup_environment
-  cleanup_containers
+  cleanup_all
 }
 
 teardown() {
-  cleanup_containers
+  cleanup_all
 }
 
 @test "enter: Try to enter the default container with no containers created" {
diff --git a/test/system/106-rm.bats b/test/system/106-rm.bats
index 9b5d3082d..0f0a76033 100644
--- a/test/system/106-rm.bats
+++ b/test/system/106-rm.bats
@@ -21,11 +21,11 @@ load 'libs/helpers'
 
 setup() {
   _setup_environment
-  cleanup_containers
+  cleanup_all
 }
 
 teardown() {
-  cleanup_containers
+  cleanup_all
 }
 
 
diff --git a/test/system/201-ipc.bats b/test/system/201-ipc.bats
index 15c791dec..20fdb32af 100644
--- a/test/system/201-ipc.bats
+++ b/test/system/201-ipc.bats
@@ -22,11 +22,13 @@ load 'libs/helpers'
 setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
-  cleanup_containers
+  cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
-  cleanup_containers
+  popd || return 1
+  cleanup_all
 }
 
 @test "ipc: No namespace" {
diff --git a/test/system/203-network.bats b/test/system/203-network.bats
index db1ba561f..4d88dc4e6 100644
--- a/test/system/203-network.bats
+++ b/test/system/203-network.bats
@@ -34,11 +34,13 @@ readonly RESOLVER_SH='resolvectl --legend false --no-pager --type "$0" query "$1
 setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
-  cleanup_containers
+  cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
-  cleanup_containers
+  popd || return 1
+  cleanup_all
 }
 
 @test "network: No namespace" {
diff --git a/test/system/206-user.bats b/test/system/206-user.bats
index c295d8a61..b51434ac2 100644
--- a/test/system/206-user.bats
+++ b/test/system/206-user.bats
@@ -22,11 +22,13 @@ load 'libs/helpers'
 setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
-  cleanup_containers
+  cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
-  cleanup_containers
+  popd || return 1
+  cleanup_all
 }
 
 @test "user: Separate namespace" {
diff --git a/test/system/210-ulimit.bats b/test/system/210-ulimit.bats
index ea0c46685..ce601da7c 100644
--- a/test/system/210-ulimit.bats
+++ b/test/system/210-ulimit.bats
@@ -22,11 +22,13 @@ load 'libs/helpers'
 setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
-  cleanup_containers
+  cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
-  cleanup_containers
+  popd || return 1
+  cleanup_all
 }
 
 @test "ulimit: real-time non-blocking time (hard)" {
diff --git a/test/system/211-dbus.bats b/test/system/211-dbus.bats
index 295bb71b2..ca34101ac 100644
--- a/test/system/211-dbus.bats
+++ b/test/system/211-dbus.bats
@@ -22,11 +22,13 @@ load 'libs/helpers'
 setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
-  cleanup_containers
+  cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
-  cleanup_containers
+  popd || return 1
+  cleanup_all
 }
 
 @test "dbus: session bus inside the default container" {
diff --git a/test/system/220-environment-variables.bats b/test/system/220-environment-variables.bats
index 0e1356654..bc818b29c 100644
--- a/test/system/220-environment-variables.bats
+++ b/test/system/220-environment-variables.bats
@@ -22,11 +22,13 @@ load 'libs/helpers'
 setup() {
   bats_require_minimum_version 1.7.0
   _setup_environment
-  cleanup_containers
+  cleanup_all
+  pushd "$HOME" || return 1
 }
 
 teardown() {
-  cleanup_containers
+  popd || return 1
+  cleanup_all
 }
 
 @test "environment variables: HISTFILESIZE inside the default container" {
diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash
index 248ba4df7..fb724c617 100644
--- a/test/system/libs/helpers.bash
+++ b/test/system/libs/helpers.bash
@@ -37,11 +37,6 @@ function cleanup_all() {
 }
 
 
-function cleanup_containers() {
-  "$PODMAN" rm --all --force >/dev/null
-}
-
-
 function _setup_environment() {
   _setup_containers_storage
   check_xdg_runtime_dir
diff --git a/test/system/setup_suite.bash b/test/system/setup_suite.bash
index e4edf232b..01985b7f9 100644
--- a/test/system/setup_suite.bash
+++ b/test/system/setup_suite.bash
@@ -17,7 +17,7 @@
 
 missing_dependencies=false
 
-if [ -f test/system/libs/bats-assert/load.bash ] && [ -f test/system/libs/bats-support/load.bash ]; then
+if [ -f "$BATS_TEST_DIRNAME/libs/bats-assert/load.bash" ] && [ -f "$BATS_TEST_DIRNAME/libs/bats-support/load.bash" ]; then
   load 'libs/helpers'
 else
   missing_dependencies=true