diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java
index cd0a649b6e..0294b6902b 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java
@@ -92,7 +92,7 @@ public class HgModifyCommand implements ModifyCommand {
       return pullCommand.execute(workingCopy.getDirectory().getAbsolutePath());
     } catch (Exception e) {
       throw new IntegrateChangesFromWorkdirException(context.getScmRepository(),
-        String.format("Could not pull modify changes from working copy to central repository", request.getBranch()),
+        String.format("Could not pull modify changes from working copy to central repository for branch %s", request.getBranch()),
         e);
     }
   }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
index 832c9aead3..c80699add8 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
@@ -78,11 +78,10 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider
   //~--- constructors ---------------------------------------------------------
 
   HgRepositoryServiceProvider(HgRepositoryHandler handler,
-                              HgHookManager hookManager, Repository repository, HgWorkdirFactory workdirFactory)
+                              HgHookManager hookManager, Repository repository)
   {
     this.repository = repository;
     this.handler = handler;
-    this.workdirFactory = workdirFactory;
     this.repositoryDirectory = handler.getDirectory(repository.getId());
     this.context = new HgCommandContext(hookManager, handler, repository,
       repositoryDirectory);
@@ -294,6 +293,4 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider
 
   /** Field description */
   private File repositoryDirectory;
-
-  private final HgWorkdirFactory workdirFactory;
 }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java
index 7b793e1b57..7519cb564d 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java
@@ -49,15 +49,13 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver
 
   private final HgRepositoryHandler handler;
   private final HgHookManager hookManager;
-  private final HgWorkdirFactory workdirFactory;
 
   @Inject
   public HgRepositoryServiceResolver(HgRepositoryHandler handler,
-                                     HgHookManager hookManager, HgWorkdirFactory workdirFactory)
+                                     HgHookManager hookManager)
   {
     this.handler = handler;
     this.hookManager = hookManager;
-    this.workdirFactory = workdirFactory;
   }
 
   @Override
@@ -65,7 +63,7 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver
     HgRepositoryServiceProvider provider = null;
 
     if (HgRepositoryHandler.TYPE_NAME.equalsIgnoreCase(repository.getType())) {
-      provider = new HgRepositoryServiceProvider(handler, hookManager, repository, workdirFactory);
+      provider = new HgRepositoryServiceProvider(handler, hookManager, repository);
     }
 
     return provider;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MergeResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MergeResourceTest.java
index 7181912cfe..202b2d20f1 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MergeResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MergeResourceTest.java
@@ -108,10 +108,7 @@ public class MergeResourceTest extends RepositoryTestBase {
     @Test
     void shouldHandleSuccessfulMerge() throws Exception {
       when(mergeCommand.merge(any())).thenReturn(MergeCommandResult.success());
-      User user = createDummyUser("dummy");
-      PrincipalCollection collection = mock(PrincipalCollection.class);
-      when(subject.getPrincipals()).thenReturn(collection);
-      when(collection.oneByType(User.class)).thenReturn(user);
+      mockUser();
 
       URL url = Resources.getResource("sonia/scm/api/v2/mergeCommand.json");
       byte[] mergeCommandJson = Resources.toByteArray(url);
@@ -129,10 +126,7 @@ public class MergeResourceTest extends RepositoryTestBase {
     @Test
     void shouldHandleFailedMerge() throws Exception {
       when(mergeCommand.merge(any())).thenReturn(MergeCommandResult.failure(asList("file1", "file2")));
-      User user = createDummyUser("dummy");
-      PrincipalCollection collection = mock(PrincipalCollection.class);
-      when(subject.getPrincipals()).thenReturn(collection);
-      when(collection.oneByType(User.class)).thenReturn(user);
+      mockUser();
 
       URL url = Resources.getResource("sonia/scm/api/v2/mergeCommand.json");
       byte[] mergeCommandJson = Resources.toByteArray(url);
@@ -201,13 +195,11 @@ public class MergeResourceTest extends RepositoryTestBase {
       assertThat(response.getStatus()).isEqualTo(204);
     }
 
-    private User createDummyUser(String name) {
-      User user = new User();
-      user.setName(name);
-      user.setType("xml");
-      user.setPassword("secret");
-      user.setCreationDate(System.currentTimeMillis());
-      return user;
+
+    private void mockUser() {
+      PrincipalCollection collection = mock(PrincipalCollection.class);
+      when(subject.getPrincipals()).thenReturn(collection);
+      when(collection.oneByType(User.class)).thenReturn(new User("dummy"));
     }
   }
 }