diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts
index 3cbd24b18a1..3e9c372fef7 100644
--- a/agent/agent-tooling/build.gradle.kts
+++ b/agent/agent-tooling/build.gradle.kts
@@ -62,9 +62,6 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-sdk-logs")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
 
-  // TODO(trask): update tests, no need to use this anymore
-  testImplementation("com.squareup.okio:okio:3.15.0")
-
   compileOnly(project(":agent:agent-bootstrap"))
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/processors/TelemetryProcessorMaskingTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/processors/TelemetryProcessorMaskingTest.java
index d6b97e648d2..534ca3658f1 100644
--- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/processors/TelemetryProcessorMaskingTest.java
+++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/processors/TelemetryProcessorMaskingTest.java
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 
 class TelemetryProcessorMaskingTest {
@@ -76,7 +75,6 @@ void shouldMaskAttributeWithGroupName() {
     assertThat(newHttpUrlAttributeValue).isEqualTo("https://user/" + mask);
   }
 
-  @NotNull
   private static AttributeProcessor maskingAttributeProcessor(
       String httpAttributeKey, String regEx, String replacementPattern) {
     Configuration.ProcessorAction maskingAction =
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializerTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializerTest.java
index 6d368bdc7d9..6f581b01705 100644
--- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializerTest.java
+++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializerTest.java
@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
@@ -164,7 +163,6 @@ public Collection<DynamicTest> runTests() {
         .collect(Collectors.toList());
   }
 
-  @NotNull
   private static ProfilerConfiguration unconfiguredState() {
     return new ProfilerConfiguration()
         .setLastModified(ProfilerConfiguration.DEFAULT_DATE)
@@ -176,7 +174,6 @@ private static ProfilerConfiguration unconfiguredState() {
             "--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled true");
   }
 
-  @NotNull
   private static ProfilerConfiguration userConfiguredTriggersState(boolean triggersEnabled) {
     return new ProfilerConfiguration()
         .setLastModified(new Date(Instant.now().toEpochMilli()))
@@ -190,7 +187,6 @@ private static ProfilerConfiguration userConfiguredTriggersState(boolean trigger
                 + triggersEnabled);
   }
 
-  @NotNull
   private static ProfilerConfiguration profileNowState(
       boolean expiredPast, boolean triggersEnabled) {
     Instant expiration;
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertTriggerSpanProcessorTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertTriggerSpanProcessorTest.java
index 371680fd3cd..62747ce97a1 100644
--- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertTriggerSpanProcessorTest.java
+++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertTriggerSpanProcessorTest.java
@@ -20,7 +20,6 @@
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -82,7 +81,6 @@ public void underThenOverThresholdDataDoesCauseAlert() throws InterruptedExcepti
         });
   }
 
-  @NotNull
   private static ReadableSpan buildSampleSpan(String fooBar, int durationMillis) {
     Instant end = Instant.now();
     Instant start = end.minusMillis(durationMillis);