diff --git a/test/system/104-run.bats b/test/system/104-run.bats
index d667aa917..3883deeb5 100644
--- a/test/system/104-run.bats
+++ b/test/system/104-run.bats
@@ -811,9 +811,15 @@ teardown() {
   assert [ ${#lines[@]} -eq 0 ]
   lines=("${stderr_lines[@]}")
   assert_line --index 0 "bash: line 1: /etc: Is a directory"
-  assert_line --index 1 "bash: line 1: exec: /etc: cannot execute: Is a directory"
-  assert_line --index 2 "Error: failed to invoke command /etc in container $(get_latest_container_name)"
-  assert [ ${#stderr_lines[@]} -eq 3 ]
+
+  if [ ${#stderr_lines[@]} -eq 2 ]; then
+    assert_line --index 1 "Error: failed to invoke command /etc in container $(get_latest_container_name)"
+  elif [ ${#stderr_lines[@]} -eq 3 ]; then
+    assert_line --index 1 "bash: line 1: exec: /etc: cannot execute: Is a directory"
+    assert_line --index 2 "Error: failed to invoke command /etc in container $(get_latest_container_name)"
+  else
+    assert bash -c "[ ${#stderr_lines[@]} -eq 2 ] || [ ${#stderr_lines[@]} -eq 3 ]"
+  fi
 }
 
 @test "run: Try a non-existent command" {
diff --git a/test/system/504-run.bats b/test/system/504-run.bats
index 98ffeaa45..7ebffe9c1 100644
--- a/test/system/504-run.bats
+++ b/test/system/504-run.bats
@@ -92,9 +92,15 @@ teardown() {
   assert [ ${#lines[@]} -eq 0 ]
   lines=("${stderr_lines[@]}")
   assert_line --index 0 "bash: line 1: /etc: Is a directory"
-  assert_line --index 1 "bash: line 1: exec: /etc: cannot execute: Is a directory"
-  assert_line --index 2 "Error: failed to invoke command /etc in container $default_container"
-  assert [ ${#stderr_lines[@]} -eq 3 ]
+
+  if [ ${#stderr_lines[@]} -eq 2 ]; then
+    assert_line --index 1 "Error: failed to invoke command /etc in container $(get_latest_container_name)"
+  elif [ ${#stderr_lines[@]} -eq 3 ]; then
+    assert_line --index 1 "bash: line 1: exec: /etc: cannot execute: Is a directory"
+    assert_line --index 2 "Error: failed to invoke command /etc in container $(get_latest_container_name)"
+  else
+    assert bash -c "[ ${#stderr_lines[@]} -eq 2 ] || [ ${#stderr_lines[@]} -eq 3 ]"
+  fi
 }
 
 @test "run: Try a non-existent command (forwarded to host)" {
diff --git a/toolbox b/toolbox
index c6d86e2b5..3f77193c2 100755
--- a/toolbox
+++ b/toolbox
@@ -1252,7 +1252,7 @@ init_container()
         fi
 
         if [ -d /run/host/monitor ] 2>&3; then
-            if ! localtime_target=$(readlink /etc/localtime >/dev/null 2>&3) \
+            if ! localtime_target=$(readlink /etc/localtime 2>&3) \
                || [ "$localtime_target" != "/run/host/monitor/localtime" ] 2>&3; then
                 echo "$base_toolbox_command: redirecting /etc/localtime to /run/host/monitor/localtime" >&3