diff --git a/plugins/git4idea/tests/git4idea/cherrypick/GitCherryPickTest.groovy b/plugins/git4idea/tests/git4idea/cherrypick/GitCherryPickTest.groovy
index 832b5adabd83..159828348f8a 100644
--- a/plugins/git4idea/tests/git4idea/cherrypick/GitCherryPickTest.groovy
+++ b/plugins/git4idea/tests/git4idea/cherrypick/GitCherryPickTest.groovy
@@ -27,17 +27,16 @@ import git4idea.history.browser.CherryPicker
 import git4idea.history.browser.GitCommit
 import git4idea.history.browser.SHAHash
 import git4idea.history.wholeTree.AbstractHash
-import git4idea.repo.GitRepository
 import git4idea.test.GitFastTest
 import git4idea.test.GitLightRepository
 import git4idea.test.MockGit
+import git4idea.test.MockVcsHelper
 import sun.security.provider.SHA
 
 import static git4idea.test.MockGit.OperationName.CHERRY_PICK
+import static git4idea.test.MockGit.commitMessageForCherryPick
 import static junit.framework.Assert.assertEquals
 import static junit.framework.Assert.assertTrue
-import static git4idea.test.MockGit.commitMessageForCherryPick
-import git4idea.test.MockVcsHelper
 
 /**
  * Common parent for all tests on cherry-pick
@@ -103,7 +102,7 @@ hint: and commit the result with 'git commit'
   }
 
   void invokeCherryPick(List<GitCommit> commits) {
-    myCherryPicker.cherryPick(Collections.<GitRepository, List<GitCommit>> singletonMap(myRepository, commits))
+    myCherryPicker.cherryPick(Collections.singletonMap(myRepository, commits))
   }
 
   void assertHeadCommit(GitCommit commit) {
diff --git a/plugins/git4idea/tests/git4idea/test/MockGit.groovy b/plugins/git4idea/tests/git4idea/test/MockGit.groovy
index 1bfae7b0802b..63d93c6e0628 100644
--- a/plugins/git4idea/tests/git4idea/test/MockGit.groovy
+++ b/plugins/git4idea/tests/git4idea/test/MockGit.groovy
@@ -40,11 +40,6 @@ class MockGit implements Git {
   public static final GitCommandResult FAKE_SUCCESS_RESULT = new GitCommandResult(true, 0, Collections.emptyList(), Collections.emptyList())
   private final Map<OperationName, Queue<OperationExecutor>> myExecutors = new HashMap<OperationName, Queue<OperationExecutor>>()
 
-  public static interface OperationExecutor {
-    GitCommandResult execute();
-    OperationName getName();
-  }
-
   public enum OperationName {
     CHERRY_PICK,
     GET_UNMERGED_FILES;
@@ -201,7 +196,7 @@ class MockGit implements Git {
     return null;
   }
 
-  public static class SimpleErrorOperationExecutor implements MockGit.OperationExecutor {
+  public static class SimpleErrorOperationExecutor implements OperationExecutor {
 
     String myOutput
     MockGit.OperationName myOperationName
@@ -222,7 +217,7 @@ class MockGit implements Git {
     }
   }
 
-  public static class SimpleSuccessOperationExecutor implements MockGit.OperationExecutor {
+  public static class SimpleSuccessOperationExecutor implements OperationExecutor {
 
     String myOutput
     MockGit.OperationName myOperationName
@@ -274,3 +269,8 @@ class MockGit implements Git {
   }
 
 }
+
+interface OperationExecutor {
+  GitCommandResult execute();
+  MockGit.OperationName getName();
+}