diff --git a/tests/service_connect.bats b/tests/service_connect.bats
index 6606a7d..90030f0 100755
--- a/tests/service_connect.bats
+++ b/tests/service_connect.bats
@@ -18,7 +18,7 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:connect) error when service does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:connect" not_existing_service
-  assert_contains "${lines[*]}" "Redis service not_existing_service does not exist"
+  assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:connect) success" {
diff --git a/tests/service_destroy.bats b/tests/service_destroy.bats
index a506820..4c1fc94 100755
--- a/tests/service_destroy.bats
+++ b/tests/service_destroy.bats
@@ -14,7 +14,7 @@ load test_helper
 
 @test "($PLUGIN_COMMAND_PREFIX:destroy) error when container does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:destroy" non_existing_container
-  assert_contains "${lines[*]}" "Redis service non_existing_container does not exist"
+  assert_contains "${lines[*]}" "service non_existing_container does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:destroy) error when container is linked to an app" {
diff --git a/tests/service_export.bats b/tests/service_export.bats
index 683a3fc..6667eb4 100755
--- a/tests/service_export.bats
+++ b/tests/service_export.bats
@@ -21,7 +21,7 @@ teardown() {
   assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
-@test "($PLUGIN_COMMAND_PREFIX:export) success with SSH TTY" {
+@test "($PLUGIN_COMMAND_PREFIX:export) success with SSH_TTY" {
   export ECHO_DOCKER_COMMAND="true"
   export SSH_TTY=`tty`
   run dokku "$PLUGIN_COMMAND_PREFIX:export" l
@@ -29,7 +29,7 @@ teardown() {
   assert_output "docker exec dokku.redis.l cat /data/dump.rdb"
 }
 
-@test "($PLUGIN_COMMAND_PREFIX:export) success without SSH TTY" {
+@test "($PLUGIN_COMMAND_PREFIX:export) success without SSH_TTY" {
   export ECHO_DOCKER_COMMAND="true"
   unset SSH_TTY
   run dokku "$PLUGIN_COMMAND_PREFIX:export" l
diff --git a/tests/service_expose.bats b/tests/service_expose.bats
index 31ab350..e15f6b6 100755
--- a/tests/service_expose.bats
+++ b/tests/service_expose.bats
@@ -16,7 +16,7 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:expose) error when service does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:expose" not_existing_service
-  assert_contains "${lines[*]}" "Redis service not_existing_service does not exist"
+  assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:expose) success when not providing a custom port" {
diff --git a/tests/service_info.bats b/tests/service_info.bats
index 82ad788..c86db48 100755
--- a/tests/service_info.bats
+++ b/tests/service_info.bats
@@ -16,7 +16,7 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:info) error when service does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:info" not_existing_service
-  assert_contains "${lines[*]}" "Redis service not_existing_service does not exist"
+  assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:info) success" {
diff --git a/tests/service_link.bats b/tests/service_link.bats
index 8081d81..ef383ce 100755
--- a/tests/service_link.bats
+++ b/tests/service_link.bats
@@ -28,7 +28,7 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:link) error when the service does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:link" not_existing_service my_app
-  assert_contains "${lines[*]}" "Redis service not_existing_service does not exist"
+  assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:link) error when the service is already linked to app" {
diff --git a/tests/service_logs.bats b/tests/service_logs.bats
index 33754e0..07d79f2 100755
--- a/tests/service_logs.bats
+++ b/tests/service_logs.bats
@@ -18,7 +18,7 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:logs) error when service does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:logs" not_existing_service
-  assert_contains "${lines[*]}" "Redis service not_existing_service does not exist"
+  assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:logs) success when not tailing" {
diff --git a/tests/service_restart.bats b/tests/service_restart.bats
index 492da85..ab20d29 100755
--- a/tests/service_restart.bats
+++ b/tests/service_restart.bats
@@ -16,7 +16,7 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:restart) error when service does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:restart" not_existing_service
-  assert_contains "${lines[*]}" "Redis service not_existing_service does not exist"
+  assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:restart) success" {
diff --git a/tests/service_start.bats b/tests/service_start.bats
index cee7b3a..69a0852 100755
--- a/tests/service_start.bats
+++ b/tests/service_start.bats
@@ -16,7 +16,7 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:start) error when service does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:start" not_existing_service
-  assert_contains "${lines[*]}" "Redis service not_existing_service does not exist"
+  assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:start) success" {
diff --git a/tests/service_stop.bats b/tests/service_stop.bats
index 3d3f39f..4b2f71b 100755
--- a/tests/service_stop.bats
+++ b/tests/service_stop.bats
@@ -16,7 +16,7 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:stop) error when service does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:stop" not_existing_service
-  assert_contains "${lines[*]}" "Redis service not_existing_service does not exist"
+  assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:stop) success" {
diff --git a/tests/service_unexpose.bats b/tests/service_unexpose.bats
index befc303..02f0b8f 100755
--- a/tests/service_unexpose.bats
+++ b/tests/service_unexpose.bats
@@ -16,7 +16,7 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:unexpose) error when service does not exist" {
   run dokku "$PLUGIN_COMMAND_PREFIX:unexpose" not_existing_service
-  assert_contains "${lines[*]}" "Redis service not_existing_service does not exist"
+  assert_contains "${lines[*]}" "service not_existing_service does not exist"
 }
 
 @test "($PLUGIN_COMMAND_PREFIX:unexpose) success" {