diff --git a/Ghidra/Features/Decompiler/build.gradle b/Ghidra/Features/Decompiler/build.gradle
index f95278172b..24b99f103f 100644
--- a/Ghidra/Features/Decompiler/build.gradle
+++ b/Ghidra/Features/Decompiler/build.gradle
@@ -31,7 +31,6 @@ dependencies {
 	api project(':SoftwareModeling')
 	// include Base src/test/resources when running decompiler integration tests (uses defaultTools)
 	integrationTestImplementation project(path: ':Base', configuration: 'testArtifacts')
-	testImplementation "org.jmockit:jmockit:1.44"
 	
     helpPath project(path: ":Base", configuration: 'helpPath')
 }
diff --git a/Ghidra/Features/FunctionGraph/build.gradle b/Ghidra/Features/FunctionGraph/build.gradle
index f572998ad9..c85d2dd912 100644
--- a/Ghidra/Features/FunctionGraph/build.gradle
+++ b/Ghidra/Features/FunctionGraph/build.gradle
@@ -29,9 +29,7 @@ dependencies {
 	api project(":Base")
 
 	api project(":GraphServices")
-   
-   	testImplementation "org.jmockit:jmockit:1.44"
-    
+       
 	helpPath project(path: ":Base", configuration: 'helpPath')
 }
 
diff --git a/Ghidra/Features/PDB/build.gradle b/Ghidra/Features/PDB/build.gradle
index beea3a7c24..2e4a66fd07 100644
--- a/Ghidra/Features/PDB/build.gradle
+++ b/Ghidra/Features/PDB/build.gradle
@@ -30,9 +30,7 @@ eclipse.project.name = 'Features PDB'
  *********************************************************************************/
 dependencies {
 	api project(":Base")
-    
-    testImplementation "org.jmockit:jmockit:1.44"	
-	
+    	
     // Demangler Analyzer needs to find MicrosoftDemangler
     api project(":MicrosoftDemangler")
 	helpPath project(path: ':Base', configuration: 'helpPath')  // this module's help has links to Base help files
diff --git a/Ghidra/Features/VersionTracking/build.gradle b/Ghidra/Features/VersionTracking/build.gradle
index efebbd13ba..58554eef85 100644
--- a/Ghidra/Features/VersionTracking/build.gradle
+++ b/Ghidra/Features/VersionTracking/build.gradle
@@ -29,7 +29,6 @@ dependencies {
 	
 	helpPath project(path: ":Base", configuration: "helpPath")
 	
-	testImplementation "org.jmockit:jmockit:1.44"
 	testImplementation project(path: ':Project', configuration: 'testArtifacts')
 	testImplementation project(path: ':SoftwareModeling', configuration: 'testArtifacts')
 }
diff --git a/Ghidra/Framework/SoftwareModeling/build.gradle b/Ghidra/Framework/SoftwareModeling/build.gradle
index f59c866513..092080cc2c 100644
--- a/Ghidra/Framework/SoftwareModeling/build.gradle
+++ b/Ghidra/Framework/SoftwareModeling/build.gradle
@@ -43,9 +43,7 @@ dependencies {
 	
 	runtimeOnly "msv:relaxngDatatype:20050913"
 	api "msv:isorelax:20050913"	
-	
-	testImplementation "org.jmockit:jmockit:1.44"	
-	
+		
 	// Must specify the specific antlr implementation to use or it will default to trying to find
 	// version 2.7.7 (which we don't have)
 	antlr "org.antlr:antlr:3.5.2"
diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle
index d577d6b8bd..d10557457d 100644
--- a/gradle/javaProject.gradle
+++ b/gradle/javaProject.gradle
@@ -156,10 +156,8 @@ artifacts {
 */  
 dependencies {
 	integrationTestImplementation "org.hamcrest:hamcrest:2.2"
-	integrationTestImplementation "org.jmockit:jmockit:1.44"
 
 	testImplementation "org.hamcrest:hamcrest:2.2"
-	testImplementation "org.jmockit:jmockit:1.44"
 
 	testImplementation "junit:junit:4.12"
 	pcodeTestImplementation "junit:junit:4.12"
diff --git a/gradle/javaTestProject.gradle b/gradle/javaTestProject.gradle
index bbd98f0563..d42edffd75 100644
--- a/gradle/javaTestProject.gradle
+++ b/gradle/javaTestProject.gradle
@@ -23,16 +23,6 @@
 		apply from: "$rootProject.projectDir/gradle/support/javaTestProject.gradle"
  *****************************************************************************************/
 
-configurations {
-	jmockitAgent
-}
-
-dependencies {
-	jmockitAgent('org.jmockit:jmockit:1.44') {
-		exclude group: 'com.google.code.findbugs', module: 'jsr305'
-	}
-}
-
 test { t ->
 
 	forkEvery 1
@@ -152,11 +142,7 @@ def initTestJVM(Task task, String rootDirName) {
     task.minHeapSize xms
     task.maxHeapSize xmx
     	
-    // for jmockit; needs the javaagent option
-    // -javaagent:/path/to/jmockit.jar
-    task.doFirst {
-	    def jmockitPath = configurations.jmockitAgent.singleFile
-	    	    
+    task.doFirst {	    	    
 		task.jvmArgs '-DupgradeProgramErrorMessage=' + upgradeProgramErrorMessage,
 			'-DupgradeTimeErrorMessage=' + upgradeTimeErrorMessage,
 			'-Dlog4j.configurationFile=' + logPropertiesUrl,
@@ -177,7 +163,6 @@ def initTestJVM(Task task, String rootDirName) {
 			'-Duser.country=US',
 			'-Duser.language=en',
 			'-Djdk.attach.allowAttachSelf',
-			'-javaagent:' + jmockitPath,
 			'-noverify',
 			'-XX:TieredStopAtLevel=1',
 			'-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort,
diff --git a/gradle/root/test.gradle b/gradle/root/test.gradle
index 25278547ff..bed5ff0ee8 100644
--- a/gradle/root/test.gradle
+++ b/gradle/root/test.gradle
@@ -32,16 +32,6 @@
  *********************************************************************************/
 apply from: "gradle/support/testUtils.gradle"
 
-configurations {
-	jmockitAgent
-}
-
-dependencies {
-	jmockitAgent('org.jmockit:jmockit:1.44') {
-		exclude group: 'com.google.code.findbugs', module: 'jsr305'
-	}
-}
-
 if (!project.hasProperty('rootTestDir')) {
 	project.ext.rootTestDir = "build"
 }
@@ -320,11 +310,7 @@ def initTestJVM(Task task, String rootDirName) {
     task.minHeapSize xms
     task.maxHeapSize xmx
     	
-    // for jmockit; needs the javaagent option
-    // -javaagent:/path/to/jmockit.jar
-    task.doFirst {
-	    def jmockitPath = configurations.jmockitAgent.singleFile
-	    
+    task.doFirst {	    
 		task.jvmArgs '-DupgradeProgramErrorMessage=' + upgradeProgramErrorMessage,
 			'-DupgradeTimeErrorMessage=' + upgradeTimeErrorMessage,
 			'-Dlog4j.configurationFile=' + logPropertiesUrl,
@@ -345,7 +331,6 @@ def initTestJVM(Task task, String rootDirName) {
 			'-Duser.country=US',
 			'-Duser.language=en',
 			'-Djdk.attach.allowAttachSelf',
-			'-javaagent:' + jmockitPath,
 			'-noverify',
 			'-XX:TieredStopAtLevel=1',
 			'-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort,