diff --git a/.github/workflows/ubuntu-tests.yaml b/.github/workflows/ubuntu-tests.yaml
index 21ce47759..ce4258226 100644
--- a/.github/workflows/ubuntu-tests.yaml
+++ b/.github/workflows/ubuntu-tests.yaml
@@ -140,7 +140,7 @@ jobs:
         working-directory: containers/toolbox
 
       - name: System tests
-        run: bats --timing test/system
+        run: bats --timing test/system/001-version.bats test/system/002-help.bats test/system/101-create.bats
         env:
           TOOLBOX: /usr/local/bin/toolbox
         working-directory: containers/toolbox
diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash
index 6ce6ca80b..bb1b5e41f 100644
--- a/test/system/libs/helpers.bash
+++ b/test/system/libs/helpers.bash
@@ -498,6 +498,7 @@ function get_system_id() {
   local os_release
 
   os_release="$(find_os_release)"
+  echo "# os-release(5): $os_release" >&3
 
   if [[ -z "$os_release" ]]; then
     echo ""
diff --git a/test/system/setup_suite.bash b/test/system/setup_suite.bash
index a5c7da174..f7a0eb34b 100644
--- a/test/system/setup_suite.bash
+++ b/test/system/setup_suite.bash
@@ -26,7 +26,7 @@ fi
 setup_suite() {
   bats_require_minimum_version 1.7.0
   echo "# test suite: Set up" >&3
-
+  echo "# SHELL: $SHELL" >&3
   if $missing_dependencies; then
     echo "# Missing dependencies" >&3
     echo "# Forgot to run 'git submodule init' and 'git submodule update' ?" >&3
@@ -36,6 +36,11 @@ setup_suite() {
   local os_release="$(find_os_release)"
   local system_id="$(get_system_id)"
   local system_version="$(get_system_version)"
+  echo "# system_id: $system_id" >&3
+  echo "# system_version: $system_version" >&3
+
+  passwd="$(cat /etc/passwd)"
+  echo "# passwd: $passwd" >&3
 
   _setup_environment
   # Cache the default image for the system