diff --git a/test/cli/accessory_test.rb b/test/cli/accessory_test.rb
index c98ceebc..f2c1d931 100644
--- a/test/cli/accessory_test.rb
+++ b/test/cli/accessory_test.rb
@@ -6,8 +6,12 @@ class CliAccessoryTest < ActiveSupport::TestCase
   include ActiveSupport::Testing::Stream
 
   test "boot" do
+    ENV["MYSQL_ROOT_PASSWORD"] = "secret123"
+
     command = stdouted { Mrsk::Cli::Accessory.start(["boot", "mysql", "-c", "test/fixtures/deploy_with_accessories.yml"]) }
     
-    assert_match "Running docker run --name app-mysql -d --restart unless-stopped -p 3306:3306 --volume /var/lib/mysql:/var/lib/mysql --label service=app-mysql mysql:5.7 on 1.1.1.3", command
+    assert_match "Running docker run --name app-mysql -d --restart unless-stopped -p 3306:3306 -e [REDACTED] -e MYSQL_ROOT_HOST=% --volume /var/lib/mysql:/var/lib/mysql --label service=app-mysql mysql:5.7 on 1.1.1.3", command
+  ensure
+    ENV["MYSQL_ROOT_PASSWORD"] = nil
   end
 end
diff --git a/test/commands/accessory_test.rb b/test/commands/accessory_test.rb
index 1973051c..5294d48c 100644
--- a/test/commands/accessory_test.rb
+++ b/test/commands/accessory_test.rb
@@ -44,11 +44,15 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
   end
 
   test "run" do
-    assert_equal \
-      [:docker, :run, "--name", "app-mysql", "-d", "--restart", "unless-stopped", "-p", "3306:3306", "--label", "service=app-mysql", "mysql:8.0"], @mysql.run
+    ENV["MYSQL_ROOT_PASSWORD"] = "secret123"
 
     assert_equal \
-      [:docker, :run, "--name", "app-redis", "-d", "--restart", "unless-stopped", "-p", "6379:6379", "--volume", "/var/lib/redis:/data", "--label", "service=app-redis", "--label", "cache=true", "redis:latest"], @redis.run
+      [:docker, :run, "--name", "app-mysql", "-d", "--restart", "unless-stopped", "-p", "3306:3306", "-e", "MYSQL_ROOT_PASSWORD=secret123", "-e", "MYSQL_ROOT_HOST=%", "--label", "service=app-mysql", "mysql:8.0"], @mysql.run
+
+    assert_equal \
+      [:docker, :run, "--name", "app-redis", "-d", "--restart", "unless-stopped", "-p", "6379:6379", "-e", "SOMETHING=else", "--volume", "/var/lib/redis:/data", "--label", "service=app-redis", "--label", "cache=true", "redis:latest"], @redis.run
+  ensure
+    ENV["MYSQL_ROOT_PASSWORD"] = nil
   end
 
   test "start" do
@@ -60,7 +64,7 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
   end
 
   test "info" do
-    assert_equal [:docker, :ps, "--filter", "name=app-mysql"], @mysql.info
+    assert_equal [:docker, :ps, "--filter", "label=service=app-mysql"], @mysql.info
   end
 
   test "logs" do
@@ -73,10 +77,10 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
   end
 
   test "remove container" do
-    assert_equal [:docker, :container, :prune, "-f", "--filter", "label=name=app-mysql"], @mysql.remove_container
+    assert_equal [:docker, :container, :prune, "-f", "--filter", "label=service=app-mysql"], @mysql.remove_container
   end
 
   test "remove image" do
-    assert_equal [:docker, :image, :prune, "-a", "-f", "--filter", "label=name=app-mysql"], @mysql.remove_image
+    assert_equal [:docker, :image, :prune, "-a", "-f", "--filter", "label=service=app-mysql"], @mysql.remove_image
   end
 end