diff --git a/tests/unit/logs.bats b/tests/unit/logs.bats
index 44eaef40a..76bb061d1 100644
--- a/tests/unit/logs.bats
+++ b/tests/unit/logs.bats
@@ -11,9 +11,182 @@ teardown() {
   global_teardown
 }
 
-@test "(network) logs:help" {
+@test "(logs) logs:help" {
   run /bin/bash -c "dokku logs:help"
   echo "output: $output"
   echo "status: $status"
   assert_output_contains "Manage log integration for an app"
 }
+
+@test "(logs) logs:report" {
+  run /bin/bash -c "dokku logs:report"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "You haven't deployed any applications yet"
+
+  run create_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku logs:report 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "$TEST_APP logs information"
+}
+
+@test "(logs) logs:report app" {
+  run create_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku logs:report $TEST_APP 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "$TEST_APP logs information"
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --invalid-flag 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+  assert_output_contains "$TEST_APP logs information" 0
+  assert_output_contains "Invalid flag passed, valid flags: --logs-global-vector-sink, --logs-vector-sink"
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-vector-sink 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "$TEST_APP logs information" 0
+  assert_output_contains "Invalid flag passed" 0
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-global-vector-sink 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "$TEST_APP logs information" 0
+  assert_output_contains "Invalid flag passed" 0
+}
+
+@test "(logs) logs:set [error]" {
+  run /bin/bash -c "dokku logs:set 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  assert_output_contains "Please specify an app to run the command on"
+  run /bin/bash -c "dokku logs:set ${TEST_APP}-non-existent" 2>&1
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+  assert_output_contains "App $TEST_APP-non-existent does not exist"
+
+  run create_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku logs:set $TEST_APP" 2>&1
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+  assert_output_contains "No property specified"
+
+  run /bin/bash -c "dokku logs:set $TEST_APP invalid" 2>&1
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+  assert_output_contains "Invalid property specified, valid properties include: vector-sink"
+
+  run /bin/bash -c "dokku logs:set $TEST_APP invalid value" 2>&1
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+  assert_output_contains "Invalid property specified, valid properties include: vector-sink"
+}
+
+@test "(logs) logs:set app" {
+  run create_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-vector-sink 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_exists
+
+  run /bin/bash -c "dokku logs:set $TEST_APP vector-sink" 2>&1
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Unsetting vector-sink"
+  assert_output_contains "Writing updated vector config to /var/lib/dokku/data/logs/vector.json"
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-vector-sink 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_exists
+
+  run /bin/bash -c "dokku logs:set $TEST_APP vector-sink console://?encoding[codec]=json" 2>&1
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Setting vector-sink"
+  assert_output_contains "Writing updated vector config to /var/lib/dokku/data/logs/vector.json"
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-vector-sink 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "console://?encoding[codec]=json"
+}
+@test "(logs) logs:set global" {
+  run create_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-global-vector-sink 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_exists
+
+  run /bin/bash -c "dokku logs:set --global vector-sink" 2>&1
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Unsetting vector-sink"
+  assert_output_contains "Writing updated vector config to /var/lib/dokku/data/logs/vector.json"
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-global-vector-sink 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_not_exists
+
+  run /bin/bash -c "dokku logs:set --global vector-sink console://?encoding[codec]=json" 2>&1
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Setting vector-sink"
+  assert_output_contains "Writing updated vector config to /var/lib/dokku/data/logs/vector.json"
+
+  run /bin/bash -c "dokku logs:report $TEST_APP --logs-global-vector-sink 2>&1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "console://?encoding[codec]=json"
+
+  run /bin/bash -c "dokku logs:set --global vector-sink" 2>&1
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Unsetting vector-sink"
+  assert_output_contains "Writing updated vector config to /var/lib/dokku/data/logs/vector.json"
+}