diff --git a/python/testSrc/com/jetbrains/python/PyFunctionTypeAnnotationParsingTest.java b/python/testSrc/com/jetbrains/python/PyFunctionTypeAnnotationParsingTest.java
index 84761ca21421..76aad7ba2fd3 100644
--- a/python/testSrc/com/jetbrains/python/PyFunctionTypeAnnotationParsingTest.java
+++ b/python/testSrc/com/jetbrains/python/PyFunctionTypeAnnotationParsingTest.java
@@ -42,6 +42,7 @@ public class PyFunctionTypeAnnotationParsingTest extends ParsingTestCase {
     registerExtensionPoint(PythonDialectsTokenSetContributor.EP_NAME, PythonDialectsTokenSetContributor.class);
     registerExtension(PythonDialectsTokenSetContributor.EP_NAME, new PythonTokenSetContributor());
     registerExtension(PythonDialectsTokenSetContributor.EP_NAME, new PyDocstringTokenSetContributor());
+    PythonDialectsTokenSetProvider.reset();
   }
 
   protected void doCodeTest(@NotNull String typeAnnotation) {
diff --git a/python/testSrc/com/jetbrains/python/PythonConsoleParsingTest.java b/python/testSrc/com/jetbrains/python/PythonConsoleParsingTest.java
index c2a03ce92fb8..5066d7810383 100644
--- a/python/testSrc/com/jetbrains/python/PythonConsoleParsingTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonConsoleParsingTest.java
@@ -40,6 +40,7 @@ public class PythonConsoleParsingTest extends ParsingTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     registerExtension(PythonDialectsTokenSetContributor.EP_NAME, new PythonTokenSetContributor());
+    PythonDialectsTokenSetProvider.reset();
   }
 
   @Override
diff --git a/python/testSrc/com/jetbrains/python/PythonParsingTest.java b/python/testSrc/com/jetbrains/python/PythonParsingTest.java
index 71d3ddfcfba4..87f285a28b2d 100644
--- a/python/testSrc/com/jetbrains/python/PythonParsingTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonParsingTest.java
@@ -41,6 +41,7 @@ public class PythonParsingTest extends ParsingTestCase {
     super.setUp();
     registerExtensionPoint(PythonDialectsTokenSetContributor.EP_NAME, PythonDialectsTokenSetContributor.class);
     registerExtension(PythonDialectsTokenSetContributor.EP_NAME, new PythonTokenSetContributor());
+    PythonDialectsTokenSetProvider.reset();
   }
 
   @Override
diff --git a/python/testSrc/com/jetbrains/python/pyi/PyiParsingTest.java b/python/testSrc/com/jetbrains/python/pyi/PyiParsingTest.java
index 468cdccfb1da..37bb1becc27c 100644
--- a/python/testSrc/com/jetbrains/python/pyi/PyiParsingTest.java
+++ b/python/testSrc/com/jetbrains/python/pyi/PyiParsingTest.java
@@ -17,9 +17,7 @@ package com.jetbrains.python.pyi;
 
 import com.intellij.testFramework.ParsingTestCase;
 import com.intellij.testFramework.TestDataPath;
-import com.jetbrains.python.PythonDialectsTokenSetContributor;
-import com.jetbrains.python.PythonTestUtil;
-import com.jetbrains.python.PythonTokenSetContributor;
+import com.jetbrains.python.*;
 import com.jetbrains.python.psi.LanguageLevel;
 
 /**
@@ -36,6 +34,7 @@ public class PyiParsingTest extends ParsingTestCase {
     super.setUp();
     registerExtensionPoint(PythonDialectsTokenSetContributor.EP_NAME, PythonDialectsTokenSetContributor.class);
     registerExtension(PythonDialectsTokenSetContributor.EP_NAME, new PythonTokenSetContributor());
+    PythonDialectsTokenSetProvider.reset();
   }
 
   @Override