diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
index a561914b42..b0cada14b1 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
@@ -224,7 +224,7 @@ public class GitConfigResourceTest {
     assertThat(configurationStoreCaptor.getValue())
       .isInstanceOfSatisfying(GitRepositoryConfig.class, x -> { })
       .extracting("defaultBranch")
-      .containsExactly("new");
+      .isEqualTo("new");
   }
 
   private MockHttpResponse get() throws URISyntaxException {
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java
index 7653fbe122..8748be3a7e 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java
@@ -53,8 +53,8 @@ public class ChangesetCollectionToDtoMapperTest {
     assertThat(collectionDto.getEmbedded().getItemsBy("branch"))
       .hasSize(1)
       .first().matches(b -> b.getLinks().getLinkBy("self").isPresent())
-      .extracting(b -> b.getLinks().getLinkBy("self").get().getHref()).first().isEqualTo("/v2/repositories/space/name/branches/someBranch");
+      .extracting(b -> b.getLinks().getLinkBy("self").get().getHref()).isEqualTo("/v2/repositories/space/name/branches/someBranch");
     assertThat(collectionDto.getEmbedded().getItemsBy("branch"))
-      .first().extracting("name").first().isEqualTo("someBranch");
+      .first().extracting("name").isEqualTo("someBranch");
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java
index da78d3b652..f19e66fbae 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java
@@ -55,7 +55,7 @@ class DiffResultToDiffResultDtoMapperTest {
       .isPresent()
       .get()
       .extracting("href")
-      .contains("/scm/api/v2/repositories/space/X/diff/123/parsed");
+      .isEqualTo("/scm/api/v2/repositories/space/X/diff/123/parsed");
   }
 
   @Test
@@ -67,7 +67,7 @@ class DiffResultToDiffResultDtoMapperTest {
       .isPresent()
       .get()
       .extracting("href")
-      .contains("/scm/api/v2/repositories/space/X/incoming/feature%2Fsome/master/diff/parsed");
+      .isEqualTo("/scm/api/v2/repositories/space/X/incoming/feature%2Fsome/master/diff/parsed");
   }
 
   private DiffResult createResult() {