diff --git a/lombok.config b/lombok.config
new file mode 100644
index 00000000..a23edb41
--- /dev/null
+++ b/lombok.config
@@ -0,0 +1,2 @@
+config.stopBubbling = true
+lombok.addLombokGeneratedAnnotation = true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8f4c971e..fda6a9e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
 
   <properties>
     <java.version>17</java.version>
+    <mockito.version>5.19.0</mockito.version>
     <mockwebserver.version>5.1.0</mockwebserver.version>
     <okhttp3.version>4.10.0</okhttp3.version>
     <ontology-tag>v3.8.3</ontology-tag>
@@ -291,7 +292,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.19.0</version>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -421,6 +422,17 @@
         </executions>
       </plugin>
 
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.5.4</version>   <!-- pick an appropriate / latest version -->
+          <configuration>
+            <argLine>
+                -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
+            </argLine>
+          </configuration>
+        </plugin>
+
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>