diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java
index 5ce225e487bf..1e14863e394b 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java
@@ -66,11 +66,15 @@ public class DomFileDescriptionTest extends DomHardCoreTestCase {
 
   @Override
   public void tearDown() throws Exception {
-    Disposer.dispose(myDisposable);
-    myFooElementFile = null;
-    myBarElementFile = null;
+    try {
+      Disposer.dispose(myDisposable);
+    }
+    finally {
+      myFooElementFile = null;
+      myBarElementFile = null;
 
-    super.tearDown();
+      super.tearDown();
+    }
   }
 
   public void testNoInitialDomnessInB() throws Throwable {