diff --git a/extensions/broker-server/build.gradle.kts b/extensions/broker-server/build.gradle.kts
index 0e92eb5e..444e5071 100644
--- a/extensions/broker-server/build.gradle.kts
+++ b/extensions/broker-server/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     `java-library`
+    id("org.gradle.test-retry") version "1.5.7"
 }
 
 val edcVersion: String by project
@@ -65,6 +66,12 @@ dependencies {
 
 tasks.getByName<Test>("test") {
     useJUnitPlatform()
+    maxParallelForks = 1
+    retry {
+        maxRetries.set(2)
+        maxFailures.set(4)
+        failOnPassedAfterRetry.set(false)
+    }
 }
 
 tasks.register("prepareKotlinBuildScriptModel") {}
diff --git a/extensions/broker-server/src/test/java/de/sovity/edc/ext/brokerserver/TestUtils.java b/extensions/broker-server/src/test/java/de/sovity/edc/ext/brokerserver/TestUtils.java
index 2d797c6c..9fba11ee 100644
--- a/extensions/broker-server/src/test/java/de/sovity/edc/ext/brokerserver/TestUtils.java
+++ b/extensions/broker-server/src/test/java/de/sovity/edc/ext/brokerserver/TestUtils.java
@@ -62,7 +62,7 @@ public static Map<String, String> createConfiguration(
         config.put("edc.oauth.provider.audience", "idsc:IDS_CONNECTORS_ALL");
 
         config.put("edc.participant.id", PARTICIPANT_ID);
-        config.put("my.edc.name.kebab.case", PARTICIPANT_ID);
+        config.put("my.edc.participant.id", PARTICIPANT_ID);
         config.put("my.edc.title", "My Connector");
         config.put("my.edc.description", "My Connector Description");
         config.put("my.edc.curator.url", "https://connector.my-org");