diff --git a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
index 25b2b12f4fc3..98884e6e2b24 100644
--- a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
+++ b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
@@ -45,8 +45,8 @@ import java.util.Map;
  * @author Kirill Likhodedov
  */
 public class MockVcsHelper extends AbstractVcsHelper {
-  private boolean myCommitDialogShown;
-  private boolean myMergeDialogShown;
+  private volatile boolean myCommitDialogShown;
+  private volatile boolean myMergeDialogShown;
 
   private CommitHandler myCommitHandler;
   private MergeHandler myMergeHandler;