diff --git a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
index e41a3a4cf6e..a9f37142898 100644
--- a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
@@ -213,15 +213,15 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
     public void tearDown() throws Exception {
         KotlinInternalMode.Instance.setEnabled(kotlinInternalModeOriginalValue);
 
-        super.tearDown();
-
-        Field listenersField = PsiProjectListener.class.getDeclaredField("ourListeners");
+        Field listenersField = PsiProjectListener.class.getDeclaredField("myListeners");
         listenersField.setAccessible(true);
-        Map listeners = (Map)listenersField.get(null);
+        Map listeners = (Map)listenersField.get(PsiProjectListener.getInstance(getProject()));
         listeners.clear();
 
         VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
 
+        super.tearDown();
+
         myModule = null;
         myAdditionalModules = null;
         myFixture.tearDown();