diff --git a/tests/unit/certs.bats b/tests/unit/certs.bats
index d321c781f34..f127a66f167 100644
--- a/tests/unit/certs.bats
+++ b/tests/unit/certs.bats
@@ -24,28 +24,28 @@ teardown() {
   teardown_local_tls
 }
 
-@test "certs:add" {
+@test "(certs) certs:add" {
   run bash -c "dokku certs:add $TEST_APP $BATS_TMPDIR/tls/server.crt $BATS_TMPDIR/tls/server.key"
   echo "output: "$output
   echo "status: "$status
   assert_success
 }
 
-@test "certs:add < tar" {
+@test "(certs) certs:add < tar" {
   run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar"
   echo "output: "$output
   echo "status: "$status
   assert_success
 }
 
-@test "certs:info" {
+@test "(certs) certs:info" {
   run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:info $TEST_APP"
   echo "output: "$output
   echo "status: "$status
   assert_success
 }
 
-@test "certs:remove" {
+@test "(certs) certs:remove" {
   run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:remove $TEST_APP"
   echo "output: "$output
   echo "status: "$status
diff --git a/tests/unit/docker-options.bats b/tests/unit/docker-options.bats
index e6d56edf2bc..86636d7f99f 100644
--- a/tests/unit/docker-options.bats
+++ b/tests/unit/docker-options.bats
@@ -10,7 +10,7 @@ teardown() {
   destroy_app
 }
 
-@test "docker-options:add (all phases)" {
+@test "(docker-options) docker-options:add (all phases)" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
   echo "output: "$output
   echo "status: "$status
@@ -21,7 +21,7 @@ teardown() {
   assert_success
 }
 
-@test "docker-options:add (build phase)" {
+@test "(docker-options) docker-options:add (build phase)" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP build \"-v /tmp\""
   echo "output: "$output
   echo "status: "$status
@@ -32,7 +32,7 @@ teardown() {
   assert_success
 }
 
-@test "docker-options:add (deploy phase)" {
+@test "(docker-options) docker-options:add (deploy phase)" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP deploy \"-v /tmp\""
   echo "output: "$output
   echo "status: "$status
@@ -43,7 +43,7 @@ teardown() {
   assert_success
 }
 
-@test "docker-options:add (run phase)" {
+@test "(docker-options) docker-options:add (run phase)" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP run \"-v /tmp\""
   echo "output: "$output
   echo "status: "$status
@@ -54,7 +54,7 @@ teardown() {
   assert_success
 }
 
-@test "docker-options:remove (all phases)" {
+@test "(docker-options) docker-options:remove (all phases)" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
   echo "output: "$output
   echo "status: "$status
@@ -73,7 +73,7 @@ teardown() {
   assert_success
 }
 
-@test "docker-options:remove (build phase)" {
+@test "(docker-options) docker-options:remove (build phase)" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
   echo "output: "$output
   echo "status: "$status
@@ -92,7 +92,7 @@ teardown() {
   assert_output "Build options: none"
 }
 
-@test "docker-options:remove (deploy phase)" {
+@test "(docker-options) docker-options:remove (deploy phase)" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
   echo "output: "$output
   echo "status: "$status
@@ -111,7 +111,7 @@ teardown() {
   assert_output "Deploy options: none"
 }
 
-@test "docker-options:remove (run phase)" {
+@test "(docker-options) docker-options:remove (run phase)" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
   echo "output: "$output
   echo "status: "$status
@@ -130,7 +130,7 @@ teardown() {
   assert_output "Run options: none"
 }
 
-@test "docker-options (deploy with options)" {
+@test "(docker-options) deploy with options" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP deploy \"-v /var/tmp\""
   echo "output: "$output
   echo "status: "$status
@@ -150,7 +150,7 @@ teardown() {
   deploy_app
 }
 
-@test "docker-options:add (all phases over SSH)" {
+@test "(docker-options) docker-options:add (all phases over SSH)" {
   run ssh dokku@dokku.me docker-options:add $TEST_APP build,deploy,run "-v /tmp"
   echo "output: "$output
   echo "status: "$status
@@ -161,7 +161,7 @@ teardown() {
   assert_success
 }
 
-@test "docker-options (dockerfile deploy with link)" {
+@test "(docker-options) dockerfile deploy with link" {
   run /bin/bash -c "dokku docker-options:add $TEST_APP deploy \"-v /var/tmp\""
   echo "output: "$output
   echo "status: "$status