diff --git a/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java
index af34ada8d3..35ebdbd403 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java
@@ -119,7 +119,7 @@ public abstract class AbstractPermissionITCaseBase<T>
     ClientResponse response = wr.post(ClientResponse.class, trillian);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 201);
+    assertEquals(response.getStatus(), 201);
     response.close();
     logoutClient(client);
     client.destroy();
@@ -311,11 +311,11 @@ public abstract class AbstractPermissionITCaseBase<T>
 
     if (credentials.isAnonymous())
     {
-      assertTrue(response.getStatus() == 401);
+      assertEquals(response.getStatus(), 401);
     }
     else
     {
-      assertTrue(response.getStatus() == 403);
+      assertEquals(response.getStatus(), 403);
     }
 
     response.close();
diff --git a/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java
index a8248655dd..57876be9d4 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java
@@ -286,11 +286,11 @@ public class AdminPermissionITCase
 
     if (credentials.isAnonymous())
     {
-      assertTrue(response.getStatus() == 401);
+      assertEquals(response.getStatus(), 401);
     }
     else
     {
-      assertTrue(response.getStatus() == 403);
+      assertEquals(response.getStatus(), 403);
     }
 
     // fix jersey-client bug
diff --git a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java
index 00d35eb174..af0ca66a63 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java
@@ -77,7 +77,7 @@ public class AuthenticationITCase
     ClientResponse response = authenticate(client, "dent", "trillian");
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 401);
+    assertEquals(response.getStatus(), 401);
     response.close();
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java b/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java
index 202200adb1..5689db1684 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java
@@ -53,6 +53,8 @@ import sonia.scm.repository.client.RepositoryClientException;
 import sonia.scm.repository.client.RepositoryClientFactory;
 import sonia.scm.util.IOUtil;
 
+import static org.hamcrest.Matchers.*;
+
 import static org.junit.Assert.*;
 
 import static sonia.scm.it.IntegrationTestUtil.*;
@@ -216,11 +218,11 @@ public class ChangesetViewerITCase extends AbstractAdminITCaseBase
 
     if ("svn".equals(repositoryType))
     {
-      assertTrue(cpr.getTotal() == (count + 1));
+      assertEquals(cpr.getTotal(), (count + 1));
     }
     else
     {
-      assertTrue(cpr.getTotal() == count);
+      assertEquals(cpr.getTotal(), count);
     }
 
     List<Changeset> changesets = cpr.getChangesets();
@@ -229,11 +231,11 @@ public class ChangesetViewerITCase extends AbstractAdminITCaseBase
 
     if ("svn".equals(repositoryType))
     {
-      assertTrue(changesets.size() == (count + 1));
+      assertEquals(changesets.size(), (count + 1));
     }
     else
     {
-      assertTrue(changesets.size() == count);
+      assertEquals(changesets.size(), count);
     }
 
     Changeset c = changesets.get(0);
@@ -250,9 +252,17 @@ public class ChangesetViewerITCase extends AbstractAdminITCaseBase
 
     assertNotNull(added);
     assertFalse(added.isEmpty());
-    assertTrue(added.size() == 1);
-    assertTrue(name.concat(".txt").equals(added.get(0))
-               || "/".concat(name).concat(".txt").equals(added.get(0)));
+    assertEquals(added.size(), 1);
+    
+    //J-
+    assertThat(
+      added.get(0),
+      anyOf(
+        equalTo(name.concat(".txt")),
+        equalTo("/".concat(name).concat(".txt"))
+      )
+    );
+    //J+
   }
 
   /**
diff --git a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
index b83608ae47..8c6d91090c 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
@@ -138,7 +138,7 @@ public class GroupITCase extends AbstractAdminITCaseBase
     ClientResponse response = wr.put(ClientResponse.class, group);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 204);
+    assertEquals(response.getStatus(), 204);
     response.close();
 
     Group other = getGroup("group-d");
@@ -202,7 +202,7 @@ public class GroupITCase extends AbstractAdminITCaseBase
     ClientResponse response = wr.post(ClientResponse.class, group);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 201);
+    assertEquals(response.getStatus(), 201);
     response.close();
 
     Group other = getGroup(group.getName());
@@ -228,12 +228,12 @@ public class GroupITCase extends AbstractAdminITCaseBase
     ClientResponse response = wr.delete(ClientResponse.class);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 204);
+    assertEquals(response.getStatus(), 204);
     response.close();
     wr = createResource(client, "groups/".concat(name));
     response = wr.get(ClientResponse.class);
     assertNotNull(response);
-    assertTrue(response.getStatus() == 404);
+    assertEquals(response.getStatus(), 404);
     response.close();
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java
index 2c038e8687..2a28999af9 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java
@@ -103,7 +103,7 @@ public class GroupPermissionITCase extends AbstractPermissionITCaseBase<Group>
     ClientResponse response = wr.post(ClientResponse.class, testGroup);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 201);
+    assertEquals(response.getStatus(), 201);
     response.close();
     logoutClient(client);
     client.destroy();
diff --git a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
index df2dca59a1..9faafc086a 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
@@ -254,7 +254,7 @@ public class IntegrationTestUtil
     ClientResponse response = wr.get(ClientResponse.class);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 200);
+    assertEquals(response.getStatus(), 200);
     response.close();
     client.destroy();
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java
index 62a30c5ccd..80d655e830 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java
@@ -195,7 +195,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
     ClientResponse response = wr.put(ClientResponse.class, repository);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 204);
+    assertEquals(response.getStatus(), 204);
     response.close();
 
     Repository other = getRepositoryById(client, repository.getId());
@@ -222,7 +222,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
     ClientResponse response = wr.get(ClientResponse.class);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 200);
+    assertEquals(response.getStatus(), 200);
 
     Collection<Repository> repositories =
       response.getEntity(new GenericType<Collection<Repository>>() {}
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
index 16cefe3c43..cd0366165d 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
@@ -88,7 +88,7 @@ public class RepositoryITUtil
     ClientResponse response = wr.post(ClientResponse.class, repository);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 201);
+    assertEquals(response.getStatus(), 201);
 
     String url = response.getHeaders().get("Location").get(0);
 
@@ -119,12 +119,12 @@ public class RepositoryITUtil
     ClientResponse response = wr.delete(ClientResponse.class);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 204);
+    assertEquals(response.getStatus(), 204);
     response.close();
     wr = createResource(client, "repositories/".concat(id));
     response = wr.get(ClientResponse.class);
     assertNotNull(response);
-    assertTrue(response.getStatus() == 404);
+    assertEquals(response.getStatus(), 404);
     response.close();
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java
index 50b42c5a9e..f929d47b05 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java
@@ -103,7 +103,7 @@ public class RepositorySimplePermissionITCase
     ClientResponse response = wr.post(ClientResponse.class, repository);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 201);
+    assertEquals(response.getStatus(), 201);
 
     String repositoryUrl = response.getHeaders().getFirst("Location");
 
@@ -112,7 +112,7 @@ public class RepositorySimplePermissionITCase
     wr = client.resource(repositoryUrl);
     response = wr.get(ClientResponse.class);
     assertNotNull(response);
-    assertTrue(response.getStatus() == 200);
+    assertEquals(response.getStatus(), 200);
     repository = response.getEntity(Repository.class);
     assertNotNull(repository);
     REPOSITORY_UUID = repository.getId();
@@ -148,7 +148,7 @@ public class RepositorySimplePermissionITCase
     if (!credentials.isAnonymous())
     {
       assertNotNull(response);
-      assertTrue(response.getStatus() == 200);
+      assertEquals(response.getStatus(), 200);
 
       Collection<Repository> repositories =
         response.getEntity(new GenericType<Collection<Repository>>() {}
@@ -172,7 +172,7 @@ public class RepositorySimplePermissionITCase
     if (!credentials.isAnonymous())
     {
       assertNotNull(response);
-      assertTrue(response.getStatus() == 403);
+      assertEquals(response.getStatus(), 403);
       response.close();
     }
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
index 03fab485a0..4da34507af 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
@@ -123,7 +123,7 @@ public class UserITCase extends AbstractAdminITCaseBase
       wr.type(MediaType.APPLICATION_XML).put(ClientResponse.class, marvin);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 204);
+    assertEquals(response.getStatus(), 204);
     response.close();
 
     User other = getUser(marvin.getName());
@@ -158,7 +158,7 @@ public class UserITCase extends AbstractAdminITCaseBase
     ClientResponse response = wr.get(ClientResponse.class);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 200);
+    assertEquals(response.getStatus(), 200);
 
     Collection<User> users =
       response.getEntity(new GenericType<Collection<User>>() {}
@@ -223,7 +223,7 @@ public class UserITCase extends AbstractAdminITCaseBase
       wr.type(MediaType.APPLICATION_XML).post(ClientResponse.class, user);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 201);
+    assertEquals(response.getStatus(), 201);
     response.close();
 
     User other = getUser(user.getName());
@@ -247,12 +247,12 @@ public class UserITCase extends AbstractAdminITCaseBase
     ClientResponse response = wr.delete(ClientResponse.class);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 204);
+    assertEquals(response.getStatus(), 204);
     response.close();
     wr = createResource(client, "users/".concat(user.getName()));
     response = wr.get(ClientResponse.class);
     assertNotNull(response);
-    assertTrue(response.getStatus() == 404);
+    assertEquals(response.getStatus(), 404);
     response.close();
   }
 
@@ -285,7 +285,7 @@ public class UserITCase extends AbstractAdminITCaseBase
     ClientResponse response = wr.get(ClientResponse.class);
 
     assertNotNull(response);
-    assertTrue(response.getStatus() == 200);
+    assertEquals(response.getStatus(), 200);
 
     User user = response.getEntity(User.class);