diff --git a/tests/src/com/android/launcher3/util/RaceConditionReproducerTest.java b/tests/src/com/android/launcher3/util/RaceConditionReproducerTest.java
index d156d1f..59f2173 100644
--- a/tests/src/com/android/launcher3/util/RaceConditionReproducerTest.java
+++ b/tests/src/com/android/launcher3/util/RaceConditionReproducerTest.java
@@ -22,6 +22,7 @@
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -45,6 +46,11 @@
         eventProcessor = new RaceConditionReproducer();
     }
 
+    @After
+    public void tearDown() {
+        TraceHelperForTest.cleanup();
+    }
+
     private void run3_3_TestAction() throws InterruptedException {
         Thread tb = new Thread(() -> {
             eventProcessor.onEvent("B1");
@@ -125,9 +131,7 @@
     @Test
     // 2 threads, 3 events each; reproducing a particular event sequence.
     public void test3_3_ReproMode() throws Exception {
-        final RaceConditionReproducer eventProcessor = new RaceConditionReproducer(
-                SOME_VALID_SEQUENCE_3_3);
-
+        eventProcessor = new RaceConditionReproducer(SOME_VALID_SEQUENCE_3_3);
         eventProcessor.startIteration();
         run3_3_TestAction();
         assertTrue(!eventProcessor.finishIteration());
diff --git a/tests/src/com/android/launcher3/util/TraceHelperForTest.java b/tests/src/com/android/launcher3/util/TraceHelperForTest.java
index 9125f5f..2fcd757 100644
--- a/tests/src/com/android/launcher3/util/TraceHelperForTest.java
+++ b/tests/src/com/android/launcher3/util/TraceHelperForTest.java
@@ -33,6 +33,11 @@
         INSTANCE_FOR_TEST.mRaceConditionReproducer = reproducer;
     }
 
+    public static void cleanup() {
+        INSTANCE_FOR_TEST.mRaceConditionReproducer = null;
+        INSTANCE_FOR_TEST.mFlagsChangeListener = null;
+    }
+
     public static void setFlagsChangeListener(IntConsumer listener) {
         TraceHelper.INSTANCE = INSTANCE_FOR_TEST;
         INSTANCE_FOR_TEST.mFlagsChangeListener = listener;