diff --git a/pom.xml b/pom.xml
index d6267e9..e3cb5f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
     <version.junit>6.0.0</version.junit>
     <version.log4j>2.25.2</version.log4j>
     <version.mockito>5.20.0</version.mockito>
+    <version.picocli>4.7.7</version.picocli>
 
     <version.plugin.appassembler>2.1.0</version.plugin.appassembler>
     <version.plugin.ant>3.1.0</version.plugin.ant>
@@ -43,6 +44,11 @@
       <artifactId>jackson-databind</artifactId>
       <version>${version.jackson}</version>
     </dependency>
+    <dependency>
+      <groupId>info.picocli</groupId>
+      <artifactId>picocli</artifactId>
+      <version>${version.picocli}</version>
+    </dependency>
 
     <!-- TEST -->
     <dependency>
@@ -106,7 +112,7 @@
           </platforms>
           <programs>
             <program>
-              <id>java-lab</id>
+              <id>${project.name}</id>
               <mainClass>se.progic.javalab.App</mainClass>
             </program>
           </programs>
@@ -142,6 +148,24 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>properties</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
+        </configuration>
+      </plugin>
     </plugins>
   </build>