diff --git a/idea/tests/org/jetbrains/jet/plugin/JetNamesHighlightingTest.java b/idea/tests/org/jetbrains/jet/plugin/NamesHighlightingTest.java
similarity index 82%
rename from idea/tests/org/jetbrains/jet/plugin/JetNamesHighlightingTest.java
rename to idea/tests/org/jetbrains/jet/plugin/NamesHighlightingTest.java
index 2895ba37716b2bbcf17e339c660c68fc24e2bab8..1cfe67566afa99e0c3a3cd259dae6b1508f73d27 100644
--- a/idea/tests/org/jetbrains/jet/plugin/JetNamesHighlightingTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/NamesHighlightingTest.java
@@ -23,7 +23,7 @@ import org.jetbrains.jet.plugin.highlighter.JetPsiChecker;
  * @author Evgeny Gerashchenko
  * @since 4/4/12
  */
-public class JetNamesHighlightingTest extends LightDaemonAnalyzerTestCase {
+public class NamesHighlightingTest extends LightDaemonAnalyzerTestCase {
     public void testTypesAndAnnotations() throws Exception {
         doTest();
     }
@@ -41,10 +41,21 @@ public class JetNamesHighlightingTest extends LightDaemonAnalyzerTestCase {
     }
 
     private void doTest() throws Exception {
-        JetPsiChecker.setNamesHighlightingTest(true);
         doTest(getTestName(false) + ".kt", false, true);
     }
 
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        JetPsiChecker.setNamesHighlightingTest(true);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        JetPsiChecker.setNamesHighlightingTest(false);
+        super.tearDown();
+    }
+
     @Override
     protected String getTestDataPath() {
         return PluginTestCaseBase.getTestDataPathBase() + "/highlighter/";