diff --git a/test/system/104-run.bats b/test/system/104-run.bats
index 36353236d..dd45d4370 100644
--- a/test/system/104-run.bats
+++ b/test/system/104-run.bats
@@ -284,13 +284,7 @@ teardown() {
 }
 
 @test "run: Ensure that a specific container is used" {
-  run echo "$name"
-
-  assert_success
-  assert_output ""
-
-  local default_container_name
-  default_container_name="$(get_system_id)-toolbox-$(get_system_version)"
+  test -z "${name+x}"
 
   create_default_container
   create_container other-container
diff --git a/test/system/211-dbus.bats b/test/system/211-dbus.bats
index 963d6f2ec..051793b7d 100644
--- a/test/system/211-dbus.bats
+++ b/test/system/211-dbus.bats
@@ -81,13 +81,11 @@ teardown_file() {
                          --object-path /org/freedesktop/DBus \
                          --method org.freedesktop.DBus.Peer.Ping)"
 
-  run --keep-empty-lines --separate-stderr "$TOOLBX" run \
-    --distro arch \
-    gdbus call \
-      --session \
-      --dest org.freedesktop.DBus \
-      --object-path /org/freedesktop/DBus \
-      --method org.freedesktop.DBus.Peer.Ping
+  run --keep-empty-lines --separate-stderr "$TOOLBX" run --distro arch gdbus call \
+                                                                         --session \
+                                                                         --dest org.freedesktop.DBus \
+                                                                         --object-path /org/freedesktop/DBus \
+                                                                         --method org.freedesktop.DBus.Peer.Ping
 
   assert_success
   assert_line --index 0 "$expected_response"