diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3fdc394e6a..551d0fa05f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,7 +19,8 @@ include("subclass",
     "junitJupiterParallelTest",
     "osgi-test",
     "bom",
-    "errorprone")
+    "errorprone",
+    "programmatic-test")
 
 if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17) && (System.getenv("ANDROID_SDK_ROOT") != null || File(".local.properties").exists())) {
     include("androidTest")
diff --git a/subprojects/programmatic-test/programmatic-test.gradle b/subprojects/programmatic-test/programmatic-test.gradle
new file mode 100644
index 0000000000..365dad93e3
--- /dev/null
+++ b/subprojects/programmatic-test/programmatic-test.gradle
@@ -0,0 +1,18 @@
+plugins {
+    id 'java'
+}
+
+description = "Test suite for excercising programmatic mock maker in Mockito"
+
+apply from: "$rootDir/gradle/dependencies.gradle"
+
+dependencies {
+    implementation project.rootProject
+    testImplementation libraries.junit4
+    testImplementation libraries.assertj
+}
+
+tasks.javadoc.enabled = false
+
+sourceCompatibility = 11
+targetCompatibility = 11
diff --git a/src/test/java/org/mockito/ProgrammaticMockMakerTest.java b/subprojects/programmatic-test/src/test/java/org/mockito/ProgrammaticMockMakerTest.java
similarity index 100%
rename from src/test/java/org/mockito/ProgrammaticMockMakerTest.java
rename to subprojects/programmatic-test/src/test/java/org/mockito/ProgrammaticMockMakerTest.java