diff --git a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/AbstractClientHandlerTestBase.java b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/AbstractClientHandlerTestBase.java
index 7a4a851cb8..fe4547ecb8 100644
--- a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/AbstractClientHandlerTestBase.java
+++ b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/AbstractClientHandlerTestBase.java
@@ -45,7 +45,7 @@ import sonia.scm.client.ScmUnauthorizedException;
 
 import static org.junit.Assert.*;
 
-import static sonia.scm.client.it.TestUtil.*;
+import static sonia.scm.client.it.ClientTestUtil.*;
 
 /**
  *
diff --git a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/TestUtil.java b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/ClientTestUtil.java
similarity index 99%
rename from scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/TestUtil.java
rename to scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/ClientTestUtil.java
index da6786c192..fc0e47805e 100644
--- a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/TestUtil.java
+++ b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/ClientTestUtil.java
@@ -50,7 +50,7 @@ import com.sun.jersey.api.client.WebResource;
  *
  * @author Sebastian Sdorra
  */
-public class TestUtil
+public class ClientTestUtil
 {
 
   /** Field description */
diff --git a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/JerseyClientProviderITCase.java b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/JerseyClientProviderITCase.java
index 33c263b7ad..3aab675b0b 100644
--- a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/JerseyClientProviderITCase.java
+++ b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/JerseyClientProviderITCase.java
@@ -43,7 +43,7 @@ import sonia.scm.client.ScmUnauthorizedException;
 
 import static org.junit.Assert.*;
 
-import static sonia.scm.client.it.TestUtil.*;
+import static sonia.scm.client.it.ClientTestUtil.*;
 
 //~--- JDK imports ------------------------------------------------------------
 
diff --git a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/JerseyRepositoryClientHandlerITCase.java b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/JerseyRepositoryClientHandlerITCase.java
index f9a88d1fc3..d960d57392 100644
--- a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/JerseyRepositoryClientHandlerITCase.java
+++ b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/JerseyRepositoryClientHandlerITCase.java
@@ -43,7 +43,7 @@ import sonia.scm.repository.RepositoryTestData;
 
 import static org.junit.Assert.*;
 
-import static sonia.scm.client.it.TestUtil.*;
+import static sonia.scm.client.it.ClientTestUtil.*;
 
 /**
  *