diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/PluginResolver.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/PluginResolver.kt
index f450145ae62..58154e319fe 100644
--- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/PluginResolver.kt
+++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/PluginResolver.kt
@@ -45,7 +45,7 @@ class PluginResolver private constructor(callerStackTrace: Array<StackTraceEleme
          * Sets a PluginResolver instance to a thread-local for the current thread.
          * This value will be retrieved by subsequent calls to fromCurrentThread.
          */
-        fun setThreadLocal(value: PluginResolver) {
+        fun setThreadLocal(value: PluginResolver?) {
             threadLocalResolver.set(value)
         }
     }
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/PluginResolverTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/PluginResolverTest.kt
index 6ee89f128d1..eb0a6c867a7 100644
--- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/PluginResolverTest.kt
+++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/PluginResolverTest.kt
@@ -6,28 +6,25 @@ package software.aws.toolkits.jetbrains.services.telemetry
 import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginManagerCore
 import io.mockk.called
-import io.mockk.clearAllMocks
 import io.mockk.every
+import io.mockk.junit5.MockKExtension
 import io.mockk.mockk
 import io.mockk.mockkStatic
 import io.mockk.verify
 import junit.framework.TestCase.assertEquals
-import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
 import software.amazon.awssdk.services.toolkittelemetry.model.AWSProduct
 
+@ExtendWith(MockKExtension::class)
 class PluginResolverTest {
     @BeforeEach
     fun setup() {
+        PluginResolver.setThreadLocal(null)
         mockkStatic(PluginManagerCore::class)
     }
 
-    @AfterEach
-    fun tearDown() {
-        clearAllMocks()
-    }
-
     @Test
     fun getsProductForAmazonQPlugin() {
         val pluginDescriptor = mockk<IdeaPluginDescriptor> {
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/utils/ThreadingUtilsKtTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/utils/ThreadingUtilsKtTest.kt
index b9bb075d3c0..140ae9d68a1 100644
--- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/utils/ThreadingUtilsKtTest.kt
+++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/utils/ThreadingUtilsKtTest.kt
@@ -10,7 +10,8 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.testFramework.ApplicationRule
 import com.intellij.util.concurrency.AppExecutorUtil
 import io.mockk.every
-import io.mockk.mockk
+import io.mockk.impl.annotations.MockK
+import io.mockk.junit4.MockKRule
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Assert.assertEquals
 import org.junit.Rule
@@ -26,6 +27,12 @@ class ThreadingUtilsKtTest {
     @JvmField
     val application = ApplicationRule()
 
+    @get:Rule
+    val mockkRule = MockKRule(this)
+
+    @MockK
+    private lateinit var pluginResolver: PluginResolver
+
     @Test
     fun `computeOnEdt runs on edt`() {
         computeOnEdt {
@@ -78,13 +85,13 @@ class ThreadingUtilsKtTest {
 
     @Test
     fun `pluginAwareExecuteOnPooledThread inherits plugin resolver`() {
-        val pluginResolver = mockk<PluginResolver> {
-            every { product } returns AWSProduct.AMAZON_Q_FOR_JET_BRAINS
-        }
+        every { pluginResolver.product } returns AWSProduct.AMAZON_Q_FOR_JET_BRAINS
         PluginResolver.setThreadLocal(pluginResolver)
 
         pluginAwareExecuteOnPooledThread {
             assertEquals(PluginResolver.fromCurrentThread().product, AWSProduct.AMAZON_Q_FOR_JET_BRAINS)
         }.get()
+
+        PluginResolver.setThreadLocal(PluginResolver.fromStackTrace(Thread.currentThread().stackTrace))
     }
 }