diff --git a/backend/elasticsearch/pom.xml b/backend/elasticsearch/pom.xml
index 75a8c67ede9..919f2f205c0 100644
--- a/backend/elasticsearch/pom.xml
+++ b/backend/elasticsearch/pom.xml
@@ -21,6 +21,10 @@
false
org.hibernate.search.backend.elasticsearch
+
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/backend/lucene/pom.xml b/backend/lucene/pom.xml
index dad79beb64c..ca536fba2d0 100644
--- a/backend/lucene/pom.xml
+++ b/backend/lucene/pom.xml
@@ -18,6 +18,10 @@
false
org.hibernate.search.backend.lucene
+
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
index 5582570c4ef..aff6767bd7e 100644
--- a/build/parents/build/pom.xml
+++ b/build/parents/build/pom.xml
@@ -271,6 +271,9 @@
jdt_apt
+
+
+ -javaagent:${org.mockito:mockito-core:jar}
@@ -1430,6 +1433,17 @@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+
+ properties
+
+
+
+
org.apache.maven.plugins
maven-enforcer-plugin
diff --git a/engine/pom.xml b/engine/pom.xml
index 8acd354e0f9..6082bd56076 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -16,6 +16,10 @@
false
org.hibernate.search.engine
+
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/integrationtest/backend/elasticsearch/pom.xml b/integrationtest/backend/elasticsearch/pom.xml
index 32138616241..888e3da76d3 100644
--- a/integrationtest/backend/elasticsearch/pom.xml
+++ b/integrationtest/backend/elasticsearch/pom.xml
@@ -14,6 +14,10 @@
elasticsearch
+
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/integrationtest/backend/lucene/pom.xml b/integrationtest/backend/lucene/pom.xml
index efdc52a1235..286d83d01f6 100644
--- a/integrationtest/backend/lucene/pom.xml
+++ b/integrationtest/backend/lucene/pom.xml
@@ -14,6 +14,9 @@
lucene
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/integrationtest/backend/tck/pom.xml b/integrationtest/backend/tck/pom.xml
index 82e4e6f5c21..c29c8b1344c 100644
--- a/integrationtest/backend/tck/pom.xml
+++ b/integrationtest/backend/tck/pom.xml
@@ -12,6 +12,11 @@
Hibernate Search ITs - Backend TCK
Hibernate Search backend TCK, including tests for every feature common to all the backends
+
+
+ ${test.mockito.agent.jvm.args}
+
+
org.hibernate.search
diff --git a/integrationtest/mapper/orm-jakarta-batch/pom.xml b/integrationtest/mapper/orm-jakarta-batch/pom.xml
index 285ff8bd8a2..9daec483c08 100644
--- a/integrationtest/mapper/orm-jakarta-batch/pom.xml
+++ b/integrationtest/mapper/orm-jakarta-batch/pom.xml
@@ -16,6 +16,7 @@
${test.elasticsearch.connection.jvm.args}
${test.weld.jvm.args}
+ ${test.mockito.agent.jvm.args}
${project.build.directory}/failsafe-reports/lucene-jbatch
diff --git a/integrationtest/mapper/orm-realbackend/pom.xml b/integrationtest/mapper/orm-realbackend/pom.xml
index dea422dd02e..1a95f8a6a82 100644
--- a/integrationtest/mapper/orm-realbackend/pom.xml
+++ b/integrationtest/mapper/orm-realbackend/pom.xml
@@ -25,6 +25,9 @@
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/integrationtest/mapper/orm/pom.xml b/integrationtest/mapper/orm/pom.xml
index 9f874fa5996..bb9bcb3051d 100644
--- a/integrationtest/mapper/orm/pom.xml
+++ b/integrationtest/mapper/orm/pom.xml
@@ -12,6 +12,12 @@
Hibernate Search ITs - ORM
Hibernate Search integration tests for the Hibernate ORM integration
+
+
+ ${test.mockito.agent.jvm.args}
+
+
+
org.hibernate.search
diff --git a/integrationtest/mapper/pojo-base/pom.xml b/integrationtest/mapper/pojo-base/pom.xml
index 49437a5ac6d..63be27c6882 100644
--- a/integrationtest/mapper/pojo-base/pom.xml
+++ b/integrationtest/mapper/pojo-base/pom.xml
@@ -19,6 +19,10 @@
false
+
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/lucene-next/integrationtest/backend/lucene/pom.xml b/lucene-next/integrationtest/backend/lucene/pom.xml
index c6c424437b2..0075da70ca3 100644
--- a/lucene-next/integrationtest/backend/lucene/pom.xml
+++ b/lucene-next/integrationtest/backend/lucene/pom.xml
@@ -16,6 +16,10 @@
integrationtest/backend/lucene
lucene
+
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/lucene-next/integrationtest/mapper/orm-jakarta-batch/pom.xml b/lucene-next/integrationtest/mapper/orm-jakarta-batch/pom.xml
index 4186d84759d..9b86f5fb0da 100644
--- a/lucene-next/integrationtest/mapper/orm-jakarta-batch/pom.xml
+++ b/lucene-next/integrationtest/mapper/orm-jakarta-batch/pom.xml
@@ -18,6 +18,7 @@
${test.elasticsearch.connection.jvm.args}
${test.weld.jvm.args}
+ ${test.mockito.agent.jvm.args}
${project.build.directory}/failsafe-reports/lucene-jbatch
diff --git a/lucene-next/integrationtest/mapper/orm-realbackend/pom.xml b/lucene-next/integrationtest/mapper/orm-realbackend/pom.xml
index 3965744448a..c7e256064dc 100644
--- a/lucene-next/integrationtest/mapper/orm-realbackend/pom.xml
+++ b/lucene-next/integrationtest/mapper/orm-realbackend/pom.xml
@@ -23,6 +23,9 @@
${failsafe.multiplebackends.reportsDirectory}/failsafe-summary.xml
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/mapper/orm-outbox-polling/pom.xml b/mapper/orm-outbox-polling/pom.xml
index fc7171250b9..e6bc70259b9 100644
--- a/mapper/orm-outbox-polling/pom.xml
+++ b/mapper/orm-outbox-polling/pom.xml
@@ -18,6 +18,10 @@
false
org.hibernate.search.mapper.orm.outboxpolling
+
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/mapper/orm/pom.xml b/mapper/orm/pom.xml
index c8dfb073ae0..f9661480731 100644
--- a/mapper/orm/pom.xml
+++ b/mapper/orm/pom.xml
@@ -18,6 +18,10 @@
false
org.hibernate.search.mapper.orm
+
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/mapper/pojo-base/pom.xml b/mapper/pojo-base/pom.xml
index 7276b75dab5..282ed1769ba 100644
--- a/mapper/pojo-base/pom.xml
+++ b/mapper/pojo-base/pom.xml
@@ -21,6 +21,10 @@
false
org.hibernate.search.mapper.pojo
+
+
+ ${test.mockito.agent.jvm.args}
+
diff --git a/pom.xml b/pom.xml
index 782efdf34dd..c73331f1d54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -402,12 +402,13 @@
-Xmx512m -Xms128m
- -Djdk.attach.allowAttachSelf=true
+ -Djdk.attach.allowAttachSelf=false
+