diff --git a/tests/message.bats b/tests/message.bats
index b47d5eda5a..eb2421b8ea 100644
--- a/tests/message.bats
+++ b/tests/message.bats
@@ -6,33 +6,28 @@ load test-helper
   assert_success
 }
 
-@test "$clinom message slack apitoken (create token)" {
-  run "${clicmd}" config delete slack_token
-  run "${clicmd}" message slack apitoken xoxp-fake-token
-  assert_output --partial 'Your slack apitoken'
-}
-
 @test "$clinom message slack apitoken (create invalid token)" {
-  run "${clicmd}" config delete slack_token
+  run "${clicmd}" config delete slack_apitoken
   run "${clicmd}" message slack apitoken fake-token
   assert_output --partial 'invalid token'
 }
 
 @test "$clinom message slack apitoken (no token)" {
-  run "${clicmd}" config delete slack_token
   run "${clicmd}" message slack apitoken
   assert_output --partial 'api.slack.com/apps'
 }
 
-@test "$clinom message slack apitoken (with token)" {
+@test "$clinom message slack apitoken (create token)" {
   run "${clicmd}" message slack apitoken xoxp-fake-token
-  run "${clicmd}" message slack apitoken
-  assert_output --partial 'Your API access token is'
+  assert_output --partial 'Your slack apitoken'
 }
 
-@test "$clinom message slack apitoken (after invalid token)" {
-  run "${clicmd}" config delete slack_token
-  run "${clicmd}" message slack apitoken fake-token
+@test "$clinom message slack apitoken (overrite token)" {
+  run "${clicmd}" message slack apitoken xoxp-another-fake-token
+  assert_output --partial 'Your slack apitoken (xoxp-another-fake-token)'
+}
+
+@test "$clinom message slack apitoken (with token)" {
   run "${clicmd}" message slack apitoken
-  assert_output --partial 'api.slack.com/apps'
+  assert_output --partial 'Your API access token is'
 }