diff --git a/quarkus-picocli/src/test/java/OpenShiftPicocliIT.java b/quarkus-picocli/src/test/java/OpenShiftPicocliIT.java
new file mode 100644
index 0000000000..c7b642c8a9
--- /dev/null
+++ b/quarkus-picocli/src/test/java/OpenShiftPicocliIT.java
@@ -0,0 +1,5 @@
+import io.quarkus.test.scenarios.OpenShiftScenario;
+
+@OpenShiftScenario
+public class OpenShiftPicocliIT extends PicocliIT {
+}
diff --git a/quarkus-picocli/src/test/java/PicocliIT.java b/quarkus-picocli/src/test/java/PicocliIT.java
index ef295e9e17..3417112942 100644
--- a/quarkus-picocli/src/test/java/PicocliIT.java
+++ b/quarkus-picocli/src/test/java/PicocliIT.java
@@ -51,7 +51,7 @@ public class PicocliIT {
             .setAutoStart(false);
 
     @Test
-    public void testAgeCommandWithApplicationScoped() {
+    public void verifyErrorForApplicationScopedBeanInPicocliCommand() {
         String expectedAgeOutput = String.format("Your age is: %s", AGE_VALUE);
         try {
             runAsync(ageApp::start);
@@ -62,7 +62,7 @@ public void testAgeCommandWithApplicationScoped() {
     }
 
     @Test
-    public void testGreetingCommand() {
+    public void verifyGreetingCommandOutputsExpectedMessage() {
         String expectedOutput = String.format("Hello %s!", GREETING_NAME_VALUE);
         try {
             runAsync(greetingApp::start);
@@ -74,7 +74,7 @@ public void testGreetingCommand() {
     }
 
     @Test
-    void blankArgsGreetingCommand() {
+    void verifyErrorForBlankArgumentsInGreetingCommand() {
         String expectedError = "Unmatched arguments from index 0: '', '--name', 'QE'";
         try {
             runAsync(greetingBlankArgumentApp::start);
@@ -85,7 +85,7 @@ void blankArgsGreetingCommand() {
     }
 
     @Test
-    void invalidArgsGreetingCommand() {
+    void verifyErrorForInvalidArgumentsInGreetingCommand() {
         String expectedError = "Unknown options: '-x', 'QE'";
         try {
             runAsync(greetingInvalidArgumentApp::start);
@@ -99,7 +99,7 @@ void invalidArgsGreetingCommand() {
      * Chain Commands in a Single Execution is not possible
      */
     @Test
-    public void testBothCommandsAtTheSameTime() {
+    public void verifyErrorForMultipleCommandsWithoutTopCommand() {
         bothTopCommandApp
                 .withProperty("quarkus.args",
                         GREETING_COMMAND_DESC + " " + GREETING_NAME_OPTION + " " + "EEUU" + " " +
@@ -115,8 +115,8 @@ public void testBothCommandsAtTheSameTime() {
     }
 
     @Test
-    public void testCustomizedCommandLine() {
-        String expectedOutput = "CustomizedName";
+    public void verifyCustomizedCommandLineBehavior() {
+        String expectedOutput = "customized";
         try {
             runAsync(customizedCommandApp::start);
             customizedCommandApp.logs().assertContains(expectedOutput);