diff --git a/plugins/google-app-engine/testSource/com/intellij/appengine/AppEngineCodeInsightTestCase.java b/plugins/google-app-engine/testSource/com/intellij/appengine/AppEngineCodeInsightTestCase.java
index 5b085d402318..e25d8b95f008 100644
--- a/plugins/google-app-engine/testSource/com/intellij/appengine/AppEngineCodeInsightTestCase.java
+++ b/plugins/google-app-engine/testSource/com/intellij/appengine/AppEngineCodeInsightTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2018 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,8 +66,12 @@ public abstract class AppEngineCodeInsightTestCase extends UsefulTestCase {
 
   @Override
   protected void tearDown() throws Exception {
-    myCodeInsightFixture.tearDown();
-    super.tearDown();
+    try {
+      myCodeInsightFixture.tearDown();
+    }
+    finally {
+      super.tearDown();
+    }
   }
 
   protected CodeInsightTestFixture createCodeInsightFixture(final String relativeTestDataPath) throws Exception {