diff --git a/src/main/resources/liquibase/harness/change/expectedSnapshot/edb-edb/16/createView.json b/src/main/resources/liquibase/harness/change/expectedSnapshot/edb-edb/16/createView.json
new file mode 100644
index 000000000..b0a5f9a9a
--- /dev/null
+++ b/src/main/resources/liquibase/harness/change/expectedSnapshot/edb-edb/16/createView.json
@@ -0,0 +1,13 @@
+{
+  "snapshot": {
+    "objects": {
+      "liquibase.structure.core.View": [
+        {
+          "view": {
+            "definition": "SELECT id,\n    first_name,\n    last_name,\n    email\n   FROM authors;",
+            "name": "test_view"
+          }
+        }]
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/liquibase/harness/change/expectedSnapshot/edb-postgres/16/createView.json b/src/main/resources/liquibase/harness/change/expectedSnapshot/edb-postgres/16/createView.json
new file mode 100644
index 000000000..b0a5f9a9a
--- /dev/null
+++ b/src/main/resources/liquibase/harness/change/expectedSnapshot/edb-postgres/16/createView.json
@@ -0,0 +1,13 @@
+{
+  "snapshot": {
+    "objects": {
+      "liquibase.structure.core.View": [
+        {
+          "view": {
+            "definition": "SELECT id,\n    first_name,\n    last_name,\n    email\n   FROM authors;",
+            "name": "test_view"
+          }
+        }]
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/docker/create-infra.sh b/src/test/resources/docker/create-infra.sh
index 3f8491b12..6d14efd8c 100755
--- a/src/test/resources/docker/create-infra.sh
+++ b/src/test/resources/docker/create-infra.sh
@@ -13,7 +13,7 @@ case $db in
     ;;
 
   # edb setup requires login to private registry
-  "edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15")
+  "edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-postgres-16"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15"|"edb-edb-16")
     docker login $REPO_URL -u $REPO_USER -p $REPO_PASSWORD
     docker compose -f docker-compose.edb.yml up -d $db
     exit 0
diff --git a/src/test/resources/docker/docker-compose.edb.yml b/src/test/resources/docker/docker-compose.edb.yml
index b5eed77a8..d77bc41eb 100644
--- a/src/test/resources/docker/docker-compose.edb.yml
+++ b/src/test/resources/docker/docker-compose.edb.yml
@@ -30,6 +30,12 @@ services:
       - "5508:5444"
     restart: always
 
+  edb-postgres-16:
+    image: docker.liquibase.net/datical-enterprisedb-edbas16
+    ports:
+      - "5509:5444"
+    restart: always
+
     # We are providing second set of EDB images to run tests with EDB driver
     # Without it tests will run in parallel and interfere with each other
 
@@ -55,4 +61,10 @@ services:
     image: docker.liquibase.net/datical-enterprisedb-edbas15:latest
     ports:
       - "5515:5444"
+    restart: always
+
+  edb-edb-16:
+    image: docker.liquibase.net/datical-enterprisedb-edbas16
+    ports:
+      - "5516:5444"
     restart: always
\ No newline at end of file
diff --git a/src/test/resources/docker/docker-compose.yml b/src/test/resources/docker/docker-compose.yml
index 5c8d5cab8..1e82ead9c 100644
--- a/src/test/resources/docker/docker-compose.yml
+++ b/src/test/resources/docker/docker-compose.yml
@@ -131,28 +131,6 @@ services:
     volumes:
       - "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh"
 
-  edb-postgres-16:
-    image: ghcr.io/enterprisedb/postgresql:16
-    ports:
-      - "5509:5432"
-    restart: always
-    environment:
-      POSTGRES_PASSWORD: LbRootPass1
-      POSTGRES_DB: lbcat
-    volumes:
-      - "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh"
-
-  edb-edb-16:
-    image: ghcr.io/enterprisedb/postgresql:16
-    ports:
-      - "5510:5432"
-    restart: always
-    environment:
-      POSTGRES_PASSWORD: LbRootPass1
-      POSTGRES_DB: lbcat
-    volumes:
-      - "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh"
-
   mariadb-10.2:
     image: mariadb:10.2
     ports:
diff --git a/src/test/resources/docker/teardown-infra.sh b/src/test/resources/docker/teardown-infra.sh
index fc9182c86..73767b9ef 100755
--- a/src/test/resources/docker/teardown-infra.sh
+++ b/src/test/resources/docker/teardown-infra.sh
@@ -6,7 +6,7 @@ db=$1
 
 case $db in
   # edb specific teardown
-  "edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15")
+  "edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-postgres-16"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15"|"edb-edb-16")
     docker compose -f docker-compose.edb.yml down --volumes
     exit 0
     ;;
diff --git a/src/test/resources/harness-config.yml b/src/test/resources/harness-config.yml
index 486eaef68..d3556ae3d 100644
--- a/src/test/resources/harness-config.yml
+++ b/src/test/resources/harness-config.yml
@@ -247,7 +247,7 @@ databasesUnderTest:
   - name: edb-edb
     prefix: docker
     version: 16
-    url: jdbc:edb://localhost:5510/lbcat
+    url: jdbc:edb://localhost:5516/lbcat
     username: lbuser
     password: LiquibasePass1