diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java
index 73d36e376dce..f9eb7cabf825 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -23,7 +23,6 @@ import com.intellij.psi.*;
 import com.intellij.psi.search.ProjectScope;
 import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesProcessor;
 import com.intellij.testFramework.PlatformTestUtil;
-import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.containers.ContainerUtil;
@@ -55,6 +54,12 @@ public class PyMoveTest extends PyTestCase {
     SystemProperties.setTestUserName("user1");
   }
 
+  @Override
+  protected void tearDown() throws Exception {
+    SystemProperties.setTestUserName(null);
+    super.tearDown();
+  }
+
   public void testFunction() {
     doMoveSymbolTest("f", "b.py");
   }
@@ -434,5 +439,4 @@ public class PyMoveTest extends PyTestCase {
     }
     return null;
   }
-}
-
+}
\ No newline at end of file