diff --git a/common/src/main/scala/org/mockito/matchers/EqMatchers.scala b/common/src/main/scala/org/mockito/matchers/EqMatchers.scala
index e1fe41fc..45b2faa4 100644
--- a/common/src/main/scala/org/mockito/matchers/EqMatchers.scala
+++ b/common/src/main/scala/org/mockito/matchers/EqMatchers.scala
@@ -1,7 +1,9 @@
 package org.mockito
 package matchers
 
+import org.mockito.internal.ValueClassExtractor
 import org.mockito.{ ArgumentMatchers => JavaMatchers }
+import org.scalactic.{ Equality, Prettifier }
 
 import scala.reflect.ClassTag
 
@@ -21,4 +23,13 @@ private[mockito] trait EqMatchers {
    * Delegates to <code>ArgumentMatchers.refEq()</code>, it's only here so we expose all the `ArgumentMatchers` on a single place
    */
   def refEq[T](value: T, excludeFields: String*): T = JavaMatchers.refEq(value, excludeFields: _*)
+
+  /**
+   * Creates a matcher that delegates on {{org.scalactic.Equality}} so you can always customise how the values are compared Also works with value classes
+   */
+  def eqTo[T: Equality: ValueClassExtractor](value: T)(implicit $pt: Prettifier): T = {
+    JavaMatchers.argThat(new EqTo[T](value))
+    value
+  }
+
 }
diff --git a/core/src/main/scala-2.12/org/mockito/matchers/EqMatchers_VersionSpecific.scala b/core/src/main/scala-2.12/org/mockito/matchers/EqMatchers_VersionSpecific.scala
deleted file mode 100644
index ebaf7ea8..00000000
--- a/core/src/main/scala-2.12/org/mockito/matchers/EqMatchers_VersionSpecific.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.mockito.matchers
-
-import org.mockito.internal.ValueClassExtractor
-import org.mockito.{ ArgumentMatchers => JavaMatchers }
-import org.scalactic.{ Equality, Prettifier }
-
-trait EqMatchers_VersionSpecific {
-
-  /**
-   * Creates a matcher that delegates on {{org.scalactic.Equality}} so you can always customise how the values are compared Also works with value classes
-   */
-  def eqTo[T: Equality: ValueClassExtractor](value: T)(implicit $pt: Prettifier): T = {
-    JavaMatchers.argThat(new EqTo[T](value))
-    value
-  }
-
-}
diff --git a/core/src/main/scala-2.13/org/mockito/matchers/EqMatchers_VersionSpecific.scala b/core/src/main/scala-2.13/org/mockito/matchers/EqMatchers_VersionSpecific.scala
deleted file mode 100644
index ebaf7ea8..00000000
--- a/core/src/main/scala-2.13/org/mockito/matchers/EqMatchers_VersionSpecific.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.mockito.matchers
-
-import org.mockito.internal.ValueClassExtractor
-import org.mockito.{ ArgumentMatchers => JavaMatchers }
-import org.scalactic.{ Equality, Prettifier }
-
-trait EqMatchers_VersionSpecific {
-
-  /**
-   * Creates a matcher that delegates on {{org.scalactic.Equality}} so you can always customise how the values are compared Also works with value classes
-   */
-  def eqTo[T: Equality: ValueClassExtractor](value: T)(implicit $pt: Prettifier): T = {
-    JavaMatchers.argThat(new EqTo[T](value))
-    value
-  }
-
-}
diff --git a/core/src/main/scala/org/mockito/ArgumentMatchersSugar.scala b/core/src/main/scala/org/mockito/ArgumentMatchersSugar.scala
index aa9ded70..7adbd626 100644
--- a/core/src/main/scala/org/mockito/ArgumentMatchersSugar.scala
+++ b/core/src/main/scala/org/mockito/ArgumentMatchersSugar.scala
@@ -25,7 +25,6 @@ import org.mockito.matchers._
 trait ArgumentMatchersSugar
     extends AnyMatchers
     with EqMatchers
-    with EqMatchers_VersionSpecific
     with ThatMatchers
     with StringThatMatchers
     with NullMatchers