diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc0694a891..16a021c2ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         java: [8, 11, 17]
-        mock-maker: ['mock-maker-default', 'mock-maker-inline']
+        mock-maker: ['mock-maker-default', 'mock-maker-inline', 'mock-maker-subclass']
 
     # All build steps
     # SINGLE-MATRIX-JOB means that the step does not need to be executed on every job in the matrix
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 313149df98..7c3c09c74d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,7 +2,8 @@ plugins {
   id("com.gradle.enterprise").version("3.3.4")
 }
 
-include("inline",
+include("subclass",
+    "inline",
     "proxy",
     "extTest",
     "groovyTest",
diff --git a/subprojects/subclass/src/main/resources/mockito-extensions/org.mockito.plugins.MemberAccessor b/subprojects/subclass/src/main/resources/mockito-extensions/org.mockito.plugins.MemberAccessor
new file mode 100644
index 0000000000..1422f9900b
--- /dev/null
+++ b/subprojects/subclass/src/main/resources/mockito-extensions/org.mockito.plugins.MemberAccessor
@@ -0,0 +1 @@
+member-accessor-module
diff --git a/subprojects/subclass/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker b/subprojects/subclass/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000..fdbd0b1579
--- /dev/null
+++ b/subprojects/subclass/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-subclass
diff --git a/subprojects/subclass/subclass.gradle b/subprojects/subclass/subclass.gradle
new file mode 100644
index 0000000000..f7c6bbe53f
--- /dev/null
+++ b/subprojects/subclass/subclass.gradle
@@ -0,0 +1,9 @@
+description = "Mockito preconfigured subclass mock maker"
+
+apply from: "$rootDir/gradle/java-library.gradle"
+
+dependencies {
+    api project.rootProject
+}
+
+tasks.javadoc.enabled = false