diff --git a/Ghidra/Framework/Generic/build.gradle b/Ghidra/Framework/Generic/build.gradle
index bf8753aa05..a465b3b090 100644
--- a/Ghidra/Framework/Generic/build.gradle
+++ b/Ghidra/Framework/Generic/build.gradle
@@ -41,8 +41,13 @@ dependencies {
 	api "org.bouncycastle:bcprov-jdk15on:1.69"
 	api "org.bouncycastle:bcutil-jdk15on:1.69"
 	
-
 	compileOnly "junit:junit:4.12"
+	
+	constraints {
+		api("com.google.guava:guava") {
+			attributes {
+				attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment, TargetJvmEnvironment.STANDARD_JVM))
+			}
+		}
+	}
 }
-
-
diff --git a/gradle/processorProject.gradle b/gradle/processorProject.gradle
index ae98e02d2a..3c2ecbd012 100644
--- a/gradle/processorProject.gradle
+++ b/gradle/processorProject.gradle
@@ -30,10 +30,7 @@
  *
  *****************************************************************************************/
 configurations {
-	sleighConfig {
-		// The following line is needed so newer versions of guava can be resolved
-		attributes.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM))
-	}
+	sleighConfig
 }
 
 dependencies {