diff --git a/python/testSrc/com/jetbrains/env/PyEnvSufficiencyTest.java b/python/testSrc/com/jetbrains/env/PyEnvSufficiencyTest.java
index 4229920e66e4..abc8309071cd 100644
--- a/python/testSrc/com/jetbrains/env/PyEnvSufficiencyTest.java
+++ b/python/testSrc/com/jetbrains/env/PyEnvSufficiencyTest.java
@@ -23,9 +23,9 @@ public class PyEnvSufficiencyTest extends PyEnvTestCase {
   @Test
   @Staging
   public void testSufficiency() {
-    checkStaging();
-    
     if (UsefulTestCase.IS_UNDER_TEAMCITY && IS_ENV_CONFIGURATION) {
+      checkStaging();
+
       Set<String> tags = Sets.newHashSet();
       List<String> roots = getPythonRoots();
       if (roots.size() == 0) {
diff --git a/python/testSrc/com/jetbrains/env/PyEnvTestCase.java b/python/testSrc/com/jetbrains/env/PyEnvTestCase.java
index 6266de9f0c47..4f06d6353c2a 100644
--- a/python/testSrc/com/jetbrains/env/PyEnvTestCase.java
+++ b/python/testSrc/com/jetbrains/env/PyEnvTestCase.java
@@ -188,7 +188,9 @@ public abstract class PyEnvTestCase {
       return;
     }
 
-    checkStaging();
+    if (UsefulTestCase.IS_UNDER_TEAMCITY && IS_ENV_CONFIGURATION) {
+      checkStaging();
+    }
 
     List<String> roots = getPythonRoots();