diff --git a/test/app_command_test.rb b/test/commands/app_command_test.rb
similarity index 95%
rename from test/app_command_test.rb
rename to test/commands/app_command_test.rb
index dc78dded..c86c6a4b 100644
--- a/test/app_command_test.rb
+++ b/test/commands/app_command_test.rb
@@ -5,7 +5,7 @@ require "mrsk/commands/app"
 ENV["VERSION"] = "123"
 ENV["RAILS_MASTER_KEY"] = "456"
 
-class AppCommandTest < ActiveSupport::TestCase
+class CommandsAppTest < ActiveSupport::TestCase
   setup do
     @config = { service: "app", image: "dhh/app", registry: { "username" => "dhh", "password" => "secret" }, servers: [ "1.1.1.1" ] }
     @app = Mrsk::Commands::App.new Mrsk::Configuration.new(@config)
diff --git a/test/builder_command_test.rb b/test/commands/builder_command_test.rb
similarity index 97%
rename from test/builder_command_test.rb
rename to test/commands/builder_command_test.rb
index a9c3082e..d8c58a0f 100644
--- a/test/builder_command_test.rb
+++ b/test/commands/builder_command_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 require "mrsk/configuration"
 require "mrsk/commands/builder"
 
-class BuilderCommandTest < ActiveSupport::TestCase
+class CommandsBuilderTest < ActiveSupport::TestCase
   setup do
     @config = { service: "app", image: "dhh/app", registry: { "username" => "dhh", "password" => "secret" }, servers: [ "1.1.1.1" ] }
   end