diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 265fef49..f9ed2ee9 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -40,7 +40,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.22.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -59,11 +58,6 @@
             <artifactId>byte-buddy-agent</artifactId>
             <version>1.9.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-            <version>2.6</version>
-        </dependency>
 
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 3d5fdab5..d9a6e262 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,15 @@
                 <version>3.2.6</version>
             </dependency>
 
+
+            <!-- ATS-71: override mockito & byte-buddy (for JDK 11) -->
+            <!-- Revisit (& remove if possible) when we upgrade Spring Boot Starter Parent (eg. 2.0.5 to 2.1) -->
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>2.22.0</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>