diff --git a/jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt b/jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt
index faec56b82c8f..2cdaac81f565 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt
+++ b/jps/jps-builders/testSrc/org/jetbrains/references/ReferenceIndexTestBase.kt
@@ -37,9 +37,10 @@ abstract class ReferenceIndexTestBase : JpsBuildTestCase() {
   }
 
   public override fun tearDown() {
-    BackwardReferenceIndexWriter.forceEnabled = false
     super.tearDown()
-    System.clearProperty(BackwardReferenceIndexWriter.PROP_KEY)
+    BackwardReferenceIndexWriter.forceEnabled = false
+    BackwardReferenceIndexWriter.clearInstance()
+//    System.clearProperty(BackwardReferenceIndexWriter.PROP_KEY)
   }
 
   protected fun assertIndexOnRebuild(vararg files: String) {