diff --git a/test/cli/main_test.rb b/test/cli/main_test.rb
new file mode 100644
index 00000000..4c8d08e4
--- /dev/null
+++ b/test/cli/main_test.rb
@@ -0,0 +1,15 @@
+require "test_helper"
+require "active_support/testing/stream"
+require "mrsk/cli"
+
+class CommandsAppTest < ActiveSupport::TestCase
+  include ActiveSupport::Testing::Stream
+
+  setup do
+  end
+
+  test "version" do
+    version = capture(:stdout) { Mrsk::Cli::Main.new.version }.strip
+    assert_equal Mrsk::VERSION, version
+  end
+end
diff --git a/test/commands/app_command_test.rb b/test/commands/app_test.rb
similarity index 100%
rename from test/commands/app_command_test.rb
rename to test/commands/app_test.rb
diff --git a/test/commands/builder_command_test.rb b/test/commands/builder_test.rb
similarity index 100%
rename from test/commands/builder_command_test.rb
rename to test/commands/builder_test.rb