diff --git a/tests/unit/caddy.bats b/tests/unit/caddy.bats
index 68a760b53..2e6b68ecb 100644
--- a/tests/unit/caddy.bats
+++ b/tests/unit/caddy.bats
@@ -77,7 +77,7 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
-  refute_output ""
+  assert_output_exists
 
   run /bin/bash -c "dokku --quiet caddy:report --global --format json | jq -r '.\"global-polling-interval\"'"
   echo "output: $output"
diff --git a/tests/unit/haproxy.bats b/tests/unit/haproxy.bats
index 1a7bee8c0..ed3a3d77a 100644
--- a/tests/unit/haproxy.bats
+++ b/tests/unit/haproxy.bats
@@ -107,7 +107,7 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
-  refute_output ""
+  assert_output_exists
 
   run /bin/bash -c "dokku --quiet haproxy:report --global --format json | jq -r '.\"global-refresh-conf\"'"
   echo "output: $output"
diff --git a/tests/unit/logs.bats b/tests/unit/logs.bats
index c0802531e..e6034f46a 100644
--- a/tests/unit/logs.bats
+++ b/tests/unit/logs.bats
@@ -412,7 +412,7 @@ teardown() {
   assert_success
   assert_output_not_exists
 
-  run /bin/bash -c "dokku logs:report $TEST_APP --logs-global-max-size 2>&1"
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-computed-max-size 2>&1"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -428,6 +428,12 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
+  assert_output_not_exists
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-computed-max-size 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
   assert_output "10m"
 
   run /bin/bash -c "dokku logs:set --global max-size 20m" 2>&1
@@ -442,6 +448,12 @@ teardown() {
   assert_success
   assert_output "20m"
 
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-computed-max-size 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "20m"
+
   run /bin/bash -c "dokku logs:set --global max-size unlimited" 2>&1
   echo "output: $output"
   echo "status: $status"
@@ -464,6 +476,12 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
+  assert_output_not_exists
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-computed-max-size 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
   assert_output "10m"
 }
 
diff --git a/tests/unit/traefik.bats b/tests/unit/traefik.bats
index cd171498c..4d603fa27 100644
--- a/tests/unit/traefik.bats
+++ b/tests/unit/traefik.bats
@@ -650,7 +650,7 @@ teardown() {
 }
 
 @test "(traefik) api-entry-point property" {
-  run /bin/bash -c "dokku traefik:report $TEST_APP --traefik-api-entry-point"
+  run /bin/bash -c "dokku traefik:report $TEST_APP --traefik-computed-api-entry-point"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -661,7 +661,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  run /bin/bash -c "dokku traefik:report $TEST_APP --traefik-api-entry-point"
+  run /bin/bash -c "dokku traefik:report $TEST_APP --traefik-computed-api-entry-point"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -672,7 +672,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  run /bin/bash -c "dokku traefik:report $TEST_APP --traefik-api-entry-point"
+  run /bin/bash -c "dokku traefik:report $TEST_APP --traefik-computed-api-entry-point"
   echo "output: $output"
   echo "status: $status"
   assert_success