diff --git a/scavenger-agent-java/build.gradle.kts b/scavenger-agent-java/build.gradle.kts
index 059d31f4..fc71e120 100644
--- a/scavenger-agent-java/build.gradle.kts
+++ b/scavenger-agent-java/build.gradle.kts
@@ -17,13 +17,10 @@ java {
     withSourcesJar()
 }
 
-tasks.withType<JavaCompile>() {
-    // Compile all modules with target level 8 except for test
-    if (name != "test") {
-        val java8 = JavaVersion.VERSION_1_8.toString()
-        sourceCompatibility = java8
-        targetCompatibility = java8
-    }
+tasks.withType<JavaCompile>().matching {
+    it.name in setOf("compileJava", "compileIntegrationTestJava")
+}.configureEach {
+    options.release = 8
 }
 
 tasks.withType<ShadowJar> {
diff --git a/scavenger-agent-java/src/integrationTest/java/integrationTest/javaagent/BenchmarkTest.java b/scavenger-agent-java/src/integrationTest/java/integrationTest/javaagent/BenchmarkTest.java
index e2287692..898c3af7 100644
--- a/scavenger-agent-java/src/integrationTest/java/integrationTest/javaagent/BenchmarkTest.java
+++ b/scavenger-agent-java/src/integrationTest/java/integrationTest/javaagent/BenchmarkTest.java
@@ -2,13 +2,11 @@
 
 import integrationTest.support.AgentBenchmarkExtension;
 import integrationTest.support.AgentRunner;
-import lombok.extern.java.Log;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-@Log
 @Disabled("Comment/remove this annotation to run benchmarks")
 @ExtendWith(AgentBenchmarkExtension.class)
 public class BenchmarkTest {