diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index f0eacea42..700b14839 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -100,12 +100,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: [ { dir: edc-tests/edc-controlplane/catalog-tests },
-                   { dir: edc-tests/edc-controlplane/edr-api-tests },
-                   { dir: edc-tests/edc-controlplane/iatp-tests },
-                   { dir: edc-tests/edc-controlplane/policy-tests },
-                   { dir: edc-tests/edc-controlplane/transfer-tests },
-                   { dir: edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests }
+        variant: [
+          { dir: edc-tests/edc-controlplane/catalog-tests },
+          { dir: edc-tests/edc-controlplane/edr-api-tests },
+          { dir: edc-tests/edc-controlplane/iatp-tests },
+          { dir: edc-tests/edc-controlplane/policy-tests },
+          { dir: edc-tests/edc-controlplane/transfer-tests },
+          { dir: edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests },
+          { dir: edc-tests/edc-dataplane/cloud-transfer-tests },
+          { dir: edc-tests/edc-end2end },
         ]
     steps:
       - uses: actions/checkout@v4
@@ -113,7 +116,7 @@ jobs:
 
       - name: Run E2E tests (${{ matrix.variant.dir }})
         run: |
-          ./gradlew compileJava compileTestJava --refresh-dependencies
+          ./gradlew compileJava compileTestJava
           ./gradlew -p ${{ matrix.variant.dir }} test -DincludeTags="EndToEndTest" -PverboseTest=true
 
   postgres-tests:
@@ -124,20 +127,3 @@ jobs:
 
       - name: Run Postgresql E2E tests
         run: ./gradlew test -DincludeTags="PostgresqlIntegrationTest" --refresh-dependencies
-
-  cloud-transfer-tests:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-java
-
-      - name: Run Azure/S3 dataplane tests
-        run: |
-          ./gradlew compileJava compileTestJava
-          ./gradlew -p edc-tests/edc-dataplane test -DincludeTags="CloudTransferTest"
-
-      - name: Run Azure/S3 End-To-End tests
-        run: |
-          ./gradlew compileJava compileTestJava
-          ./gradlew -p edc-tests/edc-end2end test -DincludeTags="EndToEndTest"
diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java
index a47b99923..2bffec3e3 100644
--- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java
+++ b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java
@@ -23,6 +23,7 @@
 import io.restassured.http.ContentType;
 import jakarta.json.Json;
 import jakarta.json.JsonObjectBuilder;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
 import org.eclipse.edc.junit.extensions.RuntimeExtension;
 import org.eclipse.edc.junit.extensions.RuntimePerClassExtension;
@@ -74,7 +75,7 @@
  */
 @SuppressWarnings("resource")
 @Testcontainers
-@CloudTransferTest
+@EndToEndTest
 public class AzureToAzureTest {
 
     private static final int PROVIDER_CONTROL_PORT = getFreePort();
diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/CloudTransferTest.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/CloudTransferTest.java
deleted file mode 100644
index 7adafa32f..000000000
--- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/CloudTransferTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.dataplane.transfer.test;
-
-import org.eclipse.edc.junit.annotations.IntegrationTest;
-import org.junit.jupiter.api.Tag;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-@IntegrationTest
-@Tag("CloudTransferTest")
-public @interface CloudTransferTest {
-}
diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java
index 9547ecf2a..e11ab57ca 100644
--- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java
+++ b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java
@@ -27,6 +27,7 @@
 import org.eclipse.edc.aws.s3.AwsClientProviderImpl;
 import org.eclipse.edc.aws.s3.S3ClientRequest;
 import org.eclipse.edc.aws.s3.spi.S3BucketSchema;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
 import org.eclipse.edc.junit.extensions.RuntimeExtension;
 import org.eclipse.edc.junit.extensions.RuntimePerClassExtension;
@@ -64,7 +65,7 @@
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
 @Testcontainers
-@CloudTransferTest
+@EndToEndTest
 public class MultiCloudTest {
     // S3 test constants
     public static final String REGION = Region.US_WEST_2.id();
diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java
index b55495a45..1fce1e270 100644
--- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java
+++ b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java
@@ -27,6 +27,7 @@
 import org.eclipse.edc.aws.s3.AwsClientProviderImpl;
 import org.eclipse.edc.aws.s3.S3ClientRequest;
 import org.eclipse.edc.aws.s3.spi.S3BucketSchema;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
 import org.eclipse.edc.junit.extensions.RuntimeExtension;
 import org.eclipse.edc.junit.extensions.RuntimePerClassExtension;
@@ -82,7 +83,7 @@
  * It spins up a fully-fledged dataplane and issues the DataFlowStartMessage via the data plane's Control API
  */
 @Testcontainers
-@CloudTransferTest
+@EndToEndTest
 public class S3ToS3Test {
 
     private static final int PROVIDER_CONTROL_PORT = getFreePort(); // port of the control api