diff --git a/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java b/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java
index dc2be2dfc1fa..c02ec553dd8f 100644
--- a/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java
+++ b/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java
@@ -81,7 +81,13 @@ public abstract class GitPlatformTest extends UsefulTestCase {
     try {
       myProjectFixture = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getTestName(true)).getFixture();
       myProjectFixture.setUp();
+    }
+    catch (Exception e) {
+      super.tearDown();
+      throw e;
+    }
 
+    try {
       myProject = myProjectFixture.getProject();
       myProjectRoot = myProject.getBaseDir();
       myProjectPath = myProjectRoot.getPath();