diff --git a/Makefile b/Makefile
index 112277d99..4185314e9 100644
--- a/Makefile
+++ b/Makefile
@@ -31,16 +31,16 @@ checkstyle:
 build: build/distributions/tiered-storage-for-apache-kafka-$(VERSION).tgz storage/s3/build/distributions/s3-$(VERSION).tgz storage/gcs/build/distributions/gcs-$(VERSION).tgz storage/azure/build/distributions/azure-$(VERSION).tgz
 
 build/distributions/tiered-storage-for-apache-kafka-$(VERSION).tgz:
-	./gradlew build distTar -x test -x integrationTest -x e2e:test
+	./gradlew build distTar -x test -x integrationTest
 
 storage/s3/build/distributions/s3-$(VERSION).tgz:
-	./gradlew build :storage:s3:distTar -x test -x integrationTest -x e2e:test
+	./gradlew build :storage:s3:distTar -x test -x integrationTest
 
 storage/gcs/build/distributions/gcs-$(VERSION).tgz:
-	./gradlew build :storage:gcs:distTar -x test -x integrationTest -x e2e:test
+	./gradlew build :storage:gcs:distTar -x test -x integrationTest
 
 storage/azure/build/distributions/azure-$(VERSION).tgz:
-	./gradlew build :storage:azure:distTar -x test -x integrationTest -x e2e:test
+	./gradlew build :storage:azure:distTar -x test -x integrationTest
 
 .PHONY: docs
 docs:
@@ -48,15 +48,15 @@ docs:
 	./gradlew :docs:genMetricsDocs
 
 test: build
-	./gradlew test -x e2e:test
+	./gradlew test
 
 integration_test: build
-	./gradlew integrationTest
+	./gradlew integrationTest -x :e2e:integrationTest
 
 E2E_TEST=LocalSystem
 
 e2e_test: build
-	./gradlew e2e:test --tests $(E2E_TEST)*
+	./gradlew e2e:integrationTest --tests $(E2E_TEST)*
 
 .PHONY: docker_image
 docker_image: build
diff --git a/e2e/build.gradle b/e2e/build.gradle
index 582904b2a..3f082c4ad 100644
--- a/e2e/build.gradle
+++ b/e2e/build.gradle
@@ -15,26 +15,26 @@
  */
 
 dependencies {
-    testImplementation "org.apache.kafka:kafka-clients:$kafkaVersion"
-    testImplementation "org.apache.kafka:kafka-server-common:$kafkaVersion"
-    testImplementation "org.apache.kafka:kafka-storage:$kafkaVersion"
-    testImplementation "org.apache.kafka:kafka-storage-api:$kafkaVersion"
+    integrationTestImplementation "org.apache.kafka:kafka-clients:$kafkaVersion"
+    integrationTestImplementation "org.apache.kafka:kafka-server-common:$kafkaVersion"
+    integrationTestImplementation "org.apache.kafka:kafka-storage:$kafkaVersion"
+    integrationTestImplementation "org.apache.kafka:kafka-storage-api:$kafkaVersion"
 
-    testImplementation "commons-io:commons-io:$apacheCommonsIOVersion"
-    testImplementation("software.amazon.awssdk:s3:$awsSdkVersion") {
+    integrationTestImplementation "commons-io:commons-io:$apacheCommonsIOVersion"
+    integrationTestImplementation("software.amazon.awssdk:s3:$awsSdkVersion") {
         exclude group: "org.slf4j"
     }
-    implementation "com.google.cloud:google-cloud-storage:$gcpSdkVersion"
+    integrationTestImplementation "com.google.cloud:google-cloud-storage:$gcpSdkVersion"
 
-    testImplementation "org.testcontainers:junit-jupiter:$testcontainersVersion"
-    testImplementation "org.testcontainers:kafka:$testcontainersVersion"
+    integrationTestImplementation "org.testcontainers:junit-jupiter:$testcontainersVersion"
+    integrationTestImplementation "org.testcontainers:kafka:$testcontainersVersion"
 
-    testImplementation "io.aiven:testcontainers-fake-gcs-server:$testcontainersFakeGcsServerVersion"
+    integrationTestImplementation "io.aiven:testcontainers-fake-gcs-server:$testcontainersFakeGcsServerVersion"
 
-    testImplementation platform("com.azure:azure-sdk-bom:$azureSdkVersion")
-    testImplementation "com.azure:azure-storage-blob"
+    integrationTestImplementation platform("com.azure:azure-sdk-bom:$azureSdkVersion")
+    integrationTestImplementation "com.azure:azure-storage-blob"
 
-    testRuntimeOnly "org.slf4j:slf4j-log4j12:$slf4jVersion"
+    integrationTestRuntimeOnly "org.slf4j:slf4j-log4j12:$slf4jVersion"
 }
 
 tasks.named('test') {
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/AzureSingleBrokerDirectTest.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/AzureSingleBrokerDirectTest.java
similarity index 96%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/AzureSingleBrokerDirectTest.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/AzureSingleBrokerDirectTest.java
index d08ddc6c5..04ad9ea73 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/AzureSingleBrokerDirectTest.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/AzureSingleBrokerDirectTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import com.azure.storage.blob.BlobContainerClient;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/AzureSingleBrokerSocks5Test.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/AzureSingleBrokerSocks5Test.java
similarity index 96%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/AzureSingleBrokerSocks5Test.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/AzureSingleBrokerSocks5Test.java
index 4412e0a95..f046bcc76 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/AzureSingleBrokerSocks5Test.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/AzureSingleBrokerSocks5Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import com.azure.storage.blob.BlobContainerClient;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/AzureSingleBrokerTest.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/AzureSingleBrokerTest.java
similarity index 98%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/AzureSingleBrokerTest.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/AzureSingleBrokerTest.java
index 95a946ce6..5844e81fa 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/AzureSingleBrokerTest.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/AzureSingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/GcsSingleBrokerDirectTest.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/GcsSingleBrokerDirectTest.java
similarity index 95%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/GcsSingleBrokerDirectTest.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/GcsSingleBrokerDirectTest.java
index 33d26acc5..693f640e9 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/GcsSingleBrokerDirectTest.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/GcsSingleBrokerDirectTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import com.google.cloud.storage.BucketInfo;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/GcsSingleBrokerSocks5Test.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/GcsSingleBrokerSocks5Test.java
similarity index 96%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/GcsSingleBrokerSocks5Test.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/GcsSingleBrokerSocks5Test.java
index 6cb386b7d..54c92d08a 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/GcsSingleBrokerSocks5Test.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/GcsSingleBrokerSocks5Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import com.google.cloud.storage.BucketInfo;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/GcsSingleBrokerTest.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/GcsSingleBrokerTest.java
similarity index 98%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/GcsSingleBrokerTest.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/GcsSingleBrokerTest.java
index bb9ba6f5a..d0afaba69 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/GcsSingleBrokerTest.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/GcsSingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/LocalSystemSingleBrokerTest.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/LocalSystemSingleBrokerTest.java
similarity index 98%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/LocalSystemSingleBrokerTest.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/LocalSystemSingleBrokerTest.java
index 7cde9d8fc..db298dd0f 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/LocalSystemSingleBrokerTest.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/LocalSystemSingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/S3MinioSingleBrokerTest.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/S3MinioSingleBrokerTest.java
similarity index 99%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/S3MinioSingleBrokerTest.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/S3MinioSingleBrokerTest.java
index 439ccb18d..a8c9884b3 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/S3MinioSingleBrokerTest.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/S3MinioSingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.net.URI;
 import java.util.ArrayList;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/SingleBrokerTest.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/SingleBrokerTest.java
similarity index 99%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/SingleBrokerTest.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/SingleBrokerTest.java
index bd3b74a6c..b3ccf643b 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/SingleBrokerTest.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/SingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.io.File;
 import java.io.IOException;
@@ -50,8 +50,8 @@
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 
-import io.aiven.kafka.tieredstorage.e2e.internal.RemoteLogMetadataTracker;
-import io.aiven.kafka.tieredstorage.e2e.internal.RemoteSegment;
+import io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal.RemoteLogMetadataTracker;
+import io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal.RemoteSegment;
 
 import com.github.dockerjava.api.model.Ulimit;
 import org.apache.commons.io.FileUtils;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/internal/RemoteLogMetadataDeserializer.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/internal/RemoteLogMetadataDeserializer.java
similarity index 94%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/internal/RemoteLogMetadataDeserializer.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/internal/RemoteLogMetadataDeserializer.java
index 232099762..2a0f965d4 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/internal/RemoteLogMetadataDeserializer.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/internal/RemoteLogMetadataDeserializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e.internal;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal;
 
 import org.apache.kafka.common.serialization.Deserializer;
 import org.apache.kafka.server.log.remote.metadata.storage.serialization.RemoteLogMetadataSerde;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/internal/RemoteLogMetadataTracker.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/internal/RemoteLogMetadataTracker.java
similarity index 99%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/internal/RemoteLogMetadataTracker.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/internal/RemoteLogMetadataTracker.java
index 47d91e278..3c35635d5 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/internal/RemoteLogMetadataTracker.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/internal/RemoteLogMetadataTracker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e.internal;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal;
 
 import java.time.Duration;
 import java.util.Comparator;
diff --git a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/internal/RemoteSegment.java b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/internal/RemoteSegment.java
similarity index 97%
rename from e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/internal/RemoteSegment.java
rename to e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/internal/RemoteSegment.java
index aa00b0eae..839fff4f8 100644
--- a/e2e/src/test/java/io/aiven/kafka/tieredstorage/e2e/internal/RemoteSegment.java
+++ b/e2e/src/integration-test/java/io/aiven/kafka/tieredstorage/e2e/internal/e2e/internal/RemoteSegment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e.internal;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal;
 
 import java.util.Objects;
 
diff --git a/e2e/src/test/resources/log4j.properties b/e2e/src/integration-test/resources/log4j.properties
similarity index 100%
rename from e2e/src/test/resources/log4j.properties
rename to e2e/src/integration-test/resources/log4j.properties