diff --git a/environment/aws/.gitignore b/environment/aws/.gitignore
index 906b2dc4..07e1bd12 100644
--- a/environment/aws/.gitignore
+++ b/environment/aws/.gitignore
@@ -1 +1,2 @@
-terraform.tfstate*
\ No newline at end of file
+terraform.tfstate*
+topology.json
\ No newline at end of file
diff --git a/jenkins/pipelines/android/android_tests.sh b/jenkins/pipelines/android/android_tests.sh
index a2f5637f..d61ca79d 100755
--- a/jenkins/pipelines/android/android_tests.sh
+++ b/jenkins/pipelines/android/android_tests.sh
@@ -50,9 +50,9 @@ echo "Start the environment"
 jenkins/pipelines/shared/setup_backend.sh "${SG_URL}"
 
 echo "Configure the tests"
-rm -rf tests/config_android.json
+rm -rf tests/dev_e2e/config_android.json
 cp -f "jenkins/pipelines/android/config_android.json" tests
-pushd tests
+pushd tests/dev_e2e
 echo '    "test-servers": ["http://'"$ANDROID_IP"':8080"]' >> config_android.json
 echo '}' >> config_android.json
 cat config_android.json
diff --git a/jenkins/pipelines/c/ios_test.sh b/jenkins/pipelines/c/ios_test.sh
index 186f33e2..04ea5640 100755
--- a/jenkins/pipelines/c/ios_test.sh
+++ b/jenkins/pipelines/c/ios_test.sh
@@ -8,7 +8,7 @@ SGW_URL=${5}
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 TEST_SERVER_DIR="${SCRIPT_DIR}/../../../servers/c"
-TESTS_DIR="${SCRIPT_DIR}/../../../tests"
+TESTS_DIR="${SCRIPT_DIR}/../../../tests/dev_e2e"
 
 echo "Build Test Server"
 pushd "${TEST_SERVER_DIR}" > /dev/null
diff --git a/jenkins/pipelines/c/linux_test.sh b/jenkins/pipelines/c/linux_test.sh
index 89cc9693..c769304c 100755
--- a/jenkins/pipelines/c/linux_test.sh
+++ b/jenkins/pipelines/c/linux_test.sh
@@ -8,7 +8,7 @@ SGW_URL=${5}
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 TEST_SERVER_DIR="${SCRIPT_DIR}/../../../servers/c"
-TESTS_DIR="${SCRIPT_DIR}/../../../tests"
+TESTS_DIR="${SCRIPT_DIR}/../../../tests/dev_e2e"
 
 echo "Build Test Server"
 pushd "${TEST_SERVER_DIR}" > /dev/null
diff --git a/jenkins/pipelines/c/macos_test.sh b/jenkins/pipelines/c/macos_test.sh
index e31c7521..62a1426e 100755
--- a/jenkins/pipelines/c/macos_test.sh
+++ b/jenkins/pipelines/c/macos_test.sh
@@ -8,7 +8,7 @@ SGW_URL=${5}
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 TEST_SERVER_DIR="${SCRIPT_DIR}/../../../servers/c"
-TESTS_DIR="${SCRIPT_DIR}/../../../tests"
+TESTS_DIR="${SCRIPT_DIR}/../../../tests/dev_e2e"
 
 echo "Build Test Server"
 pushd "${TEST_SERVER_DIR}" > /dev/null
diff --git a/jenkins/pipelines/c/wins_test.ps1 b/jenkins/pipelines/c/wins_test.ps1
index a6ea02e8..2c665c68 100644
--- a/jenkins/pipelines/c/wins_test.ps1
+++ b/jenkins/pipelines/c/wins_test.ps1
@@ -8,7 +8,7 @@ param(
 
 $TestServerDir = "$PSScriptRoot\..\..\..\servers\c"
 $SharedDir="$PSScriptRoot\..\shared"
-$TestsDir = "$PSScriptRoot\..\..\..\tests"
+$TestsDir = "$PSScriptRoot\..\..\..\tests\dev_e2e"
 
 Write-Host "Build Test Server"
 Push-Location $TestServerDir
diff --git a/jenkins/pipelines/dotnet/run_test.ps1 b/jenkins/pipelines/dotnet/run_test.ps1
index 4ce1d095..894693ba 100644
--- a/jenkins/pipelines/dotnet/run_test.ps1
+++ b/jenkins/pipelines/dotnet/run_test.ps1
@@ -22,7 +22,7 @@ if ($null -ne $PrivateKeyPath) {
 
 python $PSScriptRoot\setup_test.py @python_args
 
-Push-Location $PSScriptRoot\..\..\..\tests
+Push-Location $PSScriptRoot\..\..\..\tests\dev_e2e
 pip install -r requirements.txt
 pytest -v --no-header --config config.json
 $saved_exit = $LASTEXITCODE
diff --git a/jenkins/pipelines/dotnet/run_test.sh b/jenkins/pipelines/dotnet/run_test.sh
index e1ae54dd..b81f85dc 100755
--- a/jenkins/pipelines/dotnet/run_test.sh
+++ b/jenkins/pipelines/dotnet/run_test.sh
@@ -46,7 +46,7 @@ else
     python3 $SCRIPT_DIR/setup_test.py $platform $cbl_version $sgw_url
 fi
 
-pushd $SCRIPT_DIR/../../../tests
+pushd $SCRIPT_DIR/../../../tests/dev_e2e
 pip install -r requirements.txt
 pytest -v --no-header --config config.json
 deactivate
\ No newline at end of file
diff --git a/jenkins/pipelines/dotnet/setup_test.py b/jenkins/pipelines/dotnet/setup_test.py
index f458f720..102d572b 100644
--- a/jenkins/pipelines/dotnet/setup_test.py
+++ b/jenkins/pipelines/dotnet/setup_test.py
@@ -64,5 +64,5 @@
         args.sgw_url,
         str(SCRIPT_DIR / "config_aws.json"),
         private_key=args.private_key,
-        tdk_config_out=str(SCRIPT_DIR.parents[2] / "tests" / "config.json"),
+        tdk_config_out=str(SCRIPT_DIR.parents[2] / "tests" / "dev_e2e" / "config.json"),
     )
diff --git a/jenkins/pipelines/ios/test.sh b/jenkins/pipelines/ios/test.sh
index 43e8b9ca..7b46e029 100755
--- a/jenkins/pipelines/ios/test.sh
+++ b/jenkins/pipelines/ios/test.sh
@@ -9,7 +9,7 @@ SGW_URL=${5}
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 SHARED_DIR="${SCRIPT_DIR}/../shared"
 TEST_SERVER_DIR="${SCRIPT_DIR}/../../../servers/ios"
-TESTS_DIR="${SCRIPT_DIR}/../../../tests"
+TESTS_DIR="${SCRIPT_DIR}/../../../tests/dev_e2e"
 
 # Find a connected iOS device:
 DEVICE_UDID="$("${SHARED_DIR}/ios_device.sh")"
diff --git a/jenkins/pipelines/java/desktop/linux_tests.sh b/jenkins/pipelines/java/desktop/linux_tests.sh
index 0dcb6445..fd2f371b 100755
--- a/jenkins/pipelines/java/desktop/linux_tests.sh
+++ b/jenkins/pipelines/java/desktop/linux_tests.sh
@@ -68,9 +68,9 @@ while [[ -z "$SERVER_URL" ]]; do
 done
 
 echo "Linux Desktop: Configure the tests"
-rm -rf tests/config_java_desktop.json
+rm -rf tests/dev_e2e/config_java_desktop.json
 cp -f "jenkins/pipelines/java/desktop/config_java_desktop.json" tests
-pushd tests > /dev/null
+pushd tests/dev_e2e > /dev/null
 echo '    "test-servers": ["'"$SERVER_URL"'"]' >> config_java_desktop.json
 echo '}' >> config_java_desktop.json
 cat config_java_desktop.json
diff --git a/jenkins/pipelines/java/desktop/osx_tests.sh b/jenkins/pipelines/java/desktop/osx_tests.sh
index 458b6431..537bb76b 100755
--- a/jenkins/pipelines/java/desktop/osx_tests.sh
+++ b/jenkins/pipelines/java/desktop/osx_tests.sh
@@ -60,9 +60,9 @@ while [[ -z "$SERVER_URL" ]]; do
 done
 
 echo "OSX Desktop: Configure the tests"
-rm -rf tests/config_java_desktop.json
+rm -rf tests/dev_e2e/config_java_desktop.json
 cp -f "jenkins/pipelines/java/desktop/config_java_desktop.json" tests
-pushd tests > /dev/null
+pushd tests/dev_e2e > /dev/null
 echo '    "test-servers": ["'"$SERVER_URL"'"]' >> config_java_desktop.json
 echo '}' >> config_java_desktop.json
 cat config_java_desktop.json
diff --git a/jenkins/pipelines/java/desktop/win_tests.ps1 b/jenkins/pipelines/java/desktop/win_tests.ps1
index 41d0f017..f994cc46 100644
--- a/jenkins/pipelines/java/desktop/win_tests.ps1
+++ b/jenkins/pipelines/java/desktop/win_tests.ps1
@@ -77,9 +77,9 @@ try
     }
 
     Write-Host "Windows Desktop: Configure the tests"
-    Remove-Item -Recurse -Force -ErrorAction SilentlyContinue tests\config_java_desktop.json
+    Remove-Item -Recurse -Force -ErrorAction SilentlyContinue tests\dev_e2e\config_java_desktop.json
     Copy-Item .\jenkins\pipelines\java\desktop\config_java_desktop.json -Destination tests
-    Push-Location tests
+    Push-Location tests\dev_e2e
     Add-Content config_java_desktop.json "    `"test-servers`": [`"$serverUrl`"]"
     Add-Content config_java_desktop.json '}'
     Get-Content config_java_desktop.json
diff --git a/jenkins/pipelines/java/webservice/linux_tests.sh b/jenkins/pipelines/java/webservice/linux_tests.sh
index d90c5fda..eaa2085d 100755
--- a/jenkins/pipelines/java/webservice/linux_tests.sh
+++ b/jenkins/pipelines/java/webservice/linux_tests.sh
@@ -62,9 +62,9 @@ while [[ -z "$SERVER_URL" ]]; do
 done
 
 echo "Linux Web Service: Configure the tests"
-rm -rf tests/config_java_webservice.json
+rm -rf tests/dev_e2e/config_java_webservice.json
 cp -f "jenkins/pipelines/java/webservice/config_java_webservice.json" tests
-pushd tests > /dev/null
+pushd tests/dev_e2e > /dev/null
 echo '    "test-servers": ["'"$SERVER_URL"'"]' >> config_java_webservice.json
 echo '}' >> config_java_webservice.json
 cat config_java_webservice.json
diff --git a/jenkins/pipelines/java/webservice/osx_tests.sh b/jenkins/pipelines/java/webservice/osx_tests.sh
index f7f89c75..1208f4e1 100755
--- a/jenkins/pipelines/java/webservice/osx_tests.sh
+++ b/jenkins/pipelines/java/webservice/osx_tests.sh
@@ -53,9 +53,9 @@ while [[ -z "$SERVER_URL" ]]; do
 done
 
 echo "OSX Web Service: Configure the tests"
-rm -rf tests/config_java_webservice.json
+rm -rf tests/dev_e2e/config_java_webservice.json
 cp -f "jenkins/pipelines/java/webservice/config_java_webservice.json" tests
-pushd tests > /dev/null
+pushd tests/dev_e2e > /dev/null
 echo '    "test-servers": ["'"$SERVER_URL"'"]' >> config_java_webservice.json
 echo '}' >> config_java_webservice.json
 cat config_java_webservice.json
diff --git a/jenkins/pipelines/java/webservice/win_tests.ps1 b/jenkins/pipelines/java/webservice/win_tests.ps1
index d262a9bd..c99d42d1 100644
--- a/jenkins/pipelines/java/webservice/win_tests.ps1
+++ b/jenkins/pipelines/java/webservice/win_tests.ps1
@@ -69,9 +69,9 @@ try
     }
 
     Write-Host "Windows Web Service: Configure the tests"
-    Remove-Item -Recurse -Force -ErrorAction SilentlyContinue tests\config_java_webservice.json
+    Remove-Item -Recurse -Force -ErrorAction SilentlyContinue tests\dev_e2e\config_java_webservice.json
     Copy-Item jenkins\pipelines\java\webservice\config_java_webservice.json -Destination tests
-    Push-Location tests
+    Push-Location tests\dev_e2e
     Add-Content config_java_webservice.json "    `"test-servers`": [`"$serverUrl`"]"
     Add-Content config_java_webservice.json '}'
     Get-Content config_java_webservice.json
diff --git a/tests/.gitignore b/tests/.gitignore
index c90ed7da..1707ac77 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -7,3 +7,4 @@ java-config.json
 c-config.json
 testserver.log
 session.log
+config.json
diff --git a/tests/README.md b/tests/dev_e2e/README.md
similarity index 100%
rename from tests/README.md
rename to tests/dev_e2e/README.md
diff --git a/tests/config.example.json b/tests/dev_e2e/config.example.json
similarity index 100%
rename from tests/config.example.json
rename to tests/dev_e2e/config.example.json
diff --git a/tests/conftest.py b/tests/dev_e2e/conftest.py
similarity index 100%
rename from tests/conftest.py
rename to tests/dev_e2e/conftest.py
diff --git a/tests/pytest.ini b/tests/dev_e2e/pytest.ini
similarity index 100%
rename from tests/pytest.ini
rename to tests/dev_e2e/pytest.ini
diff --git a/tests/requirements.txt b/tests/dev_e2e/requirements.txt
similarity index 100%
rename from tests/requirements.txt
rename to tests/dev_e2e/requirements.txt
diff --git a/tests/test_basic_replication.py b/tests/dev_e2e/test_basic_replication.py
similarity index 100%
rename from tests/test_basic_replication.py
rename to tests/dev_e2e/test_basic_replication.py
diff --git a/tests/test_custom_conflict.py b/tests/dev_e2e/test_custom_conflict.py
similarity index 100%
rename from tests/test_custom_conflict.py
rename to tests/dev_e2e/test_custom_conflict.py
diff --git a/tests/test_fest.py b/tests/dev_e2e/test_fest.py
similarity index 100%
rename from tests/test_fest.py
rename to tests/dev_e2e/test_fest.py
diff --git a/tests/test_query_consistency.py b/tests/dev_e2e/test_query_consistency.py
similarity index 100%
rename from tests/test_query_consistency.py
rename to tests/dev_e2e/test_query_consistency.py
diff --git a/tests/test_replication_auto_purge.py b/tests/dev_e2e/test_replication_auto_purge.py
similarity index 100%
rename from tests/test_replication_auto_purge.py
rename to tests/dev_e2e/test_replication_auto_purge.py
diff --git a/tests/test_replication_behavior.py b/tests/dev_e2e/test_replication_behavior.py
similarity index 100%
rename from tests/test_replication_behavior.py
rename to tests/dev_e2e/test_replication_behavior.py
diff --git a/tests/test_replication_blob.py b/tests/dev_e2e/test_replication_blob.py
similarity index 100%
rename from tests/test_replication_blob.py
rename to tests/dev_e2e/test_replication_blob.py
diff --git a/tests/test_replication_filter.py b/tests/dev_e2e/test_replication_filter.py
similarity index 100%
rename from tests/test_replication_filter.py
rename to tests/dev_e2e/test_replication_filter.py
diff --git a/tests/test_replication_filter_data.py b/tests/dev_e2e/test_replication_filter_data.py
similarity index 100%
rename from tests/test_replication_filter_data.py
rename to tests/dev_e2e/test_replication_filter_data.py