diff --git a/tests/unit/logs.bats b/tests/unit/logs.bats
index 8913b62b2..d5d9b5b6c 100644
--- a/tests/unit/logs.bats
+++ b/tests/unit/logs.bats
@@ -9,6 +9,7 @@ setup() {
 
 teardown() {
   destroy_app
+  dokku logs:set --global vector-image >/dev/null 2>/dev/null || true
   dokku logs:set --global vector-networks >/dev/null 2>/dev/null || true
   docker network rm test-vector-net-a >/dev/null || true
   docker network rm test-vector-net-b >/dev/null || true
@@ -57,7 +58,7 @@ teardown() {
   echo "status: $status"
   assert_failure
   assert_output_contains "$TEST_APP logs information" 0
-  assert_output_contains "Invalid flag passed, valid flags: --logs-app-label-alias, --logs-computed-app-label-alias, --logs-computed-max-size, --logs-global-app-label-alias, --logs-global-max-size, --logs-global-vector-sink, --logs-max-size, --logs-vector-global-image, --logs-vector-global-networks, --logs-vector-sink"
+  assert_output_contains "Invalid flag passed, valid flags: --logs-app-label-alias, --logs-computed-app-label-alias, --logs-computed-max-size, --logs-computed-vector-image, --logs-computed-vector-networks, --logs-computed-vector-sink, --logs-global-app-label-alias, --logs-global-max-size, --logs-global-vector-image, --logs-global-vector-networks, --logs-global-vector-sink, --logs-max-size, --logs-vector-sink"
 
   run /bin/bash -c "dokku logs:report $TEST_APP --logs-vector-sink 2>&1"
   echo "output: $output"
@@ -74,6 +75,14 @@ teardown() {
   assert_output_contains "Invalid flag passed" 0
 }
 
+@test "(logs) logs:report --global invalid flag" {
+  run /bin/bash -c "dokku logs:report --global --invalid-flag 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+  assert_output_contains "Invalid flag passed, valid flags: --logs-computed-app-label-alias, --logs-computed-max-size, --logs-computed-vector-image, --logs-computed-vector-networks, --logs-computed-vector-sink, --logs-global-app-label-alias, --logs-global-max-size, --logs-global-vector-image, --logs-global-vector-networks, --logs-global-vector-sink"
+}
+
 @test "(logs) logs:set [error]" {
   run /bin/bash -c "dokku logs:set 2>&1"
   echo "output: $output"
@@ -528,21 +537,21 @@ teardown() {
   run /bin/bash -c "dokku logs:set --global vector-image"
   assert_success
 
-  run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-vector-global-image\"'"
+  run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-global-vector-image\"'"
   assert_success
   assert_output_exists
 
   run /bin/bash -c "dokku logs:set --global vector-image timberio/vector:custom"
   assert_success
 
-  run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-vector-global-image\"'"
+  run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-global-vector-image\"'"
   assert_success
   assert_output "timberio/vector:custom"
 
   run /bin/bash -c "dokku logs:set --global vector-image"
   assert_success
 
-  run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-vector-global-networks\"'"
+  run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-global-vector-networks\"'"
   assert_success
   assert_output ""
 }
@@ -586,7 +595,7 @@ teardown() {
   assert_success
   assert_output_contains "Setting vector-networks"
 
-  run /bin/bash -c "dokku logs:report --global --logs-vector-global-networks 2>&1"
+  run /bin/bash -c "dokku logs:report --global --logs-global-vector-networks 2>&1"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -598,7 +607,7 @@ teardown() {
   assert_success
   assert_output_contains "Setting vector-networks"
 
-  run /bin/bash -c "dokku logs:report --global --logs-vector-global-networks 2>&1"
+  run /bin/bash -c "dokku logs:report --global --logs-global-vector-networks 2>&1"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -610,7 +619,7 @@ teardown() {
   assert_success
   assert_output_contains "Unsetting vector-networks"
 
-  run /bin/bash -c "dokku logs:report --global --logs-vector-global-networks 2>&1"
+  run /bin/bash -c "dokku logs:report --global --logs-global-vector-networks 2>&1"
   echo "output: $output"
   echo "status: $status"
   assert_success