diff --git a/tests/bats/80_alerts.bats b/tests/bats/80_alerts.bats
index cebea58b3..6874630fa 100644
--- a/tests/bats/80_alerts.bats
+++ b/tests/bats/80_alerts.bats
@@ -32,6 +32,11 @@ teardown() {
     assert_output --partial "| 'githubciXXXXXXXXXXXXXXXXXXXXXXXX' |"
     refute_output --partial "| githubciXXXXXXXXXXXXXXXXXXXXXXXX |"
 
+    run -0 cscli alerts list -m
+    assert_output --partial 'MACHINE'
+    assert_output --partial "| 'githubciXXXXXXXXXXXXXXXXXXXXXXXX' |"
+    assert_output --partial "| githubciXXXXXXXXXXXXXXXXXXXXXXXX |"
+
     run -0 cscli alerts list --machine
     assert_output --partial 'MACHINE'
     assert_output --partial "| 'githubciXXXXXXXXXXXXXXXXXXXXXXXX' |"
diff --git a/tests/bats/90_decisions.bats b/tests/bats/90_decisions.bats
index ee7a58cc9..451852da7 100644
--- a/tests/bats/90_decisions.bats
+++ b/tests/bats/90_decisions.bats
@@ -37,3 +37,23 @@ declare stderr
     assert_output '["fatal","Missing arguments, a value is required (--ip, --range or --scope and --value)"]'
 }
 
+@test "$FILE cscli decisions list, with and without --machine" {
+    run -0 cscli decisions add -i 10.20.30.40 -t ban
+
+    run -0 cscli decisions list
+    refute_output --partial 'MACHINE'
+    # machine name appears quoted in the "REASON" column
+    assert_output --partial "| 'githubciXXXXXXXXXXXXXXXXXXXXXXXX' |"
+    refute_output --partial "| githubciXXXXXXXXXXXXXXXXXXXXXXXX |"
+
+    run -0 cscli decisions list -m
+    assert_output --partial 'MACHINE'
+    assert_output --partial "| 'githubciXXXXXXXXXXXXXXXXXXXXXXXX' |"
+    assert_output --partial "| githubciXXXXXXXXXXXXXXXXXXXXXXXX |"
+
+    run -0 cscli decisions list --machine
+    assert_output --partial 'MACHINE'
+    assert_output --partial "| 'githubciXXXXXXXXXXXXXXXXXXXXXXXX' |"
+    assert_output --partial "| githubciXXXXXXXXXXXXXXXXXXXXXXXX |"
+}
+