diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index 32c97f6ec..09d549b82 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
     implementation(libs.edc.sql.core)
     runtimeOnly(libs.postgres)
 
-    implementation("org.flywaydb:flyway-core:9.19.0")
+    implementation("org.flywaydb:flyway-core:9.19.1")
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
index 1e3f72754..a59ecaf7b 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
@@ -43,6 +43,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
@@ -61,8 +62,8 @@ class ProvisionAdditionalHeadersExtensionTest {
     private final DataFlowController dataFlowController = mock(DataFlowController.class);
     private final RemoteMessageDispatcherRegistry dispatcherRegistry = mock(RemoteMessageDispatcherRegistry.class);
 
-    private ContractNegotiationStore contractNegotiationStore = mock(ContractNegotiationStore.class);
-    private ContractValidationService contractValidationService = mock(ContractValidationService.class);
+    private final ContractNegotiationStore contractNegotiationStore = mock(ContractNegotiationStore.class);
+    private final ContractValidationService contractValidationService = mock(ContractValidationService.class);
 
     @BeforeEach
     void setUp(EdcExtension extension) {
@@ -110,10 +111,7 @@ void shouldPutContractIdAsHeaderInDataAddress(
 
         assertThat(result).matches(ServiceResult::succeeded);
 
-        await().untilAsserted(
-                () -> {
-                    verify(dataFlowController)
-                            .initiateFlow(any(), argThat(it -> "aContractId".equals(it.getProperty("header:Edc-Contract-Agreement-Id"))), any());
-                });
+        await().atMost(Duration.ofSeconds(5))
+                .untilAsserted(() -> verify(dataFlowController).initiateFlow(any(), argThat(it -> "aContractId".equals(it.getProperty("header:Edc-Contract-Agreement-Id"))), any()));
     }
 }