Migrate basic system tests to new test support types.

Makefile

@@ -203,9 +203,12 @@ WARMUP_FILTER = ImageWarmup
 
 CONCURRENT_TEST_SUITES ?= \
 	TestCLIExportCommand/ \
+	TestCLIHelp \
 	TestCLIMachineCommand/ \
 	TestCLIRmRaceCondition/ \
-	TestCLIStop/
+	TestCLIStatus \
+	TestCLIStop/ \
+	TestCLIVersion/
 CONCURRENT_FILTER = $(subst $(space),|,$(strip $(CONCURRENT_TEST_SUITES)))
 
 GLOBAL_TEST_SUITES ?= \
@@ -271,9 +274,6 @@ coverage-integration-new: all
 	$(RUN_INTEGRATION)
 
 INTEGRATION_TEST_SUITES ?= \
-	TestCLIHelp \
-	TestCLIStatus \
-	TestCLIVersion \
 	TestCLINetwork \
 	TestCLIRunLifecycle \
 	TestCLIRunCapabilities \

Tests/IntegrationTests/System/TestCLIHelp.swift

@@ -0,0 +1,42 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2026 Apple Inc. and the container project authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+import Testing
+
+@Suite
+struct TestCLIHelp {
+    @Test func testHelp() async throws {
+        try await ContainerFixture.with { f in
+            let result = try f.run(["help"])
+            #expect(result.status == 0, "help should succeed, stderr: \(result.error)")
+            #expect(
+                result.output.contains("OVERVIEW: A container platform for macOS"),
+                "output should contain overview section"
+            )
+        }
+    }
+
+    @Test func testDebugHelp() async throws {
+        try await ContainerFixture.with { f in
+            let result = try f.run(["--debug", "help"])
+            #expect(result.status == 0, "help should succeed, stderr: \(result.error)")
+            #expect(
+                result.output.contains("OVERVIEW: A container platform for macOS"),
+                "output should contain overview section"
+            )
+        }
+    }
+}