diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash
index f4132d058..248ba4df7 100644
--- a/test/system/libs/helpers.bash
+++ b/test/system/libs/helpers.bash
@@ -334,17 +334,20 @@ function pull_distro_image() {
   fi
 
   # No need to copy if the image is already available in Podman
-  run "$PODMAN" image exists "${image}"
-  if [[ "$status" -eq 0 ]]; then
-    return
+  if "$PODMAN" image exists "${image}"; then
+    return 0
   fi
 
   # https://github.com/containers/skopeo/issues/547 for the options for containers-storage
   run "$SKOPEO" copy "dir:${IMAGE_CACHE_DIR}/${image_archive}" "containers-storage:[overlay@$ROOTLESS_PODMAN_STORE_DIR+$ROOTLESS_PODMAN_STORE_DIR]${image}"
+
+  # shellcheck disable=SC2154
   if [ "$status" -ne 0 ]; then
     echo "Failed to load image ${image} from cache ${IMAGE_CACHE_DIR}/${image_archive}"
     assert_success
   fi
+
+  return 0
 }
 
 
diff --git a/test/system/meson.build b/test/system/meson.build
index fface8222..9546ef7fb 100644
--- a/test/system/meson.build
+++ b/test/system/meson.build
@@ -1,9 +1,21 @@
 test_system = files(
+  '001-version.bats',
+  '002-help.bats',
+  '101-create.bats',
+  '102-list.bats',
+  '103-container.bats',
+  '104-run.bats',
+  '105-enter.bats',
+  '106-rm.bats',
+  '107-rmi.bats',
+  '108-completion.bats',
   '201-ipc.bats',
   '203-network.bats',
   '206-user.bats',
   '210-ulimit.bats',
   '211-dbus.bats',
+  'setup_suite.bash',
+  'libs/helpers.bash',
 )
 
 if shellcheck.found()