diff --git a/presto-product-tests/README.md b/presto-product-tests/README.md
index 76d8018ac7ac..68251203f215 100644
--- a/presto-product-tests/README.md
+++ b/presto-product-tests/README.md
@@ -118,8 +118,8 @@ where profile is one of either:
  a single Docker container, a single node installation of Presto
  also running on a single Docker container and one running SQL Server server.
  While running tests on ``singlenode-sqlserver`` make sure to exclude
- `mysql_connector` and `postgresql_connector` tests i.e.
- `-x mysql_connector, postgresql_connector`.
+ `mysql_connector` and `postgresql` tests i.e.
+ `-x mysql_connector, postgresql`.
 
 ### Hadoop docker image used for testing
 The default Hadoop/Hive docker image used for testing is defined in `conf/common/compose-commons.sh` and can be controlled
diff --git a/presto-product-tests/bin/product-tests-suite-1.sh b/presto-product-tests/bin/product-tests-suite-1.sh
index 8b765ca9e733..61fc79183be4 100755
--- a/presto-product-tests/bin/product-tests-suite-1.sh
+++ b/presto-product-tests/bin/product-tests-suite-1.sh
@@ -6,7 +6,7 @@ exit_code=0
 
 presto-product-tests/bin/run_on_docker.sh \
     multinode \
-    -x quarantine,big_query,storage_formats,profile_specific_tests,tpcds,cassandra,mysql_connector,postgresql_connector,mysql,kafka,simba_jdbc \
+    -x quarantine,big_query,storage_formats,profile_specific_tests,tpcds,cassandra,mysql_connector,postgresql,mysql,kafka,simba_jdbc \
     || exit_code=1
 
 exit "${exit_code}"
diff --git a/presto-product-tests/bin/product-tests-suite-3.sh b/presto-product-tests/bin/product-tests-suite-3.sh
index cd6aa68a3afd..8b0dfd5d9f3a 100755
--- a/presto-product-tests/bin/product-tests-suite-3.sh
+++ b/presto-product-tests/bin/product-tests-suite-3.sh
@@ -11,7 +11,7 @@ presto-product-tests/bin/run_on_docker.sh \
 
 presto-product-tests/bin/run_on_docker.sh \
     singlenode-postgresql \
-    -g postgresql_connector \
+    -g postgresql \
     || exit_code=1
 
 presto-product-tests/bin/run_on_docker.sh \
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/describe_real_table.sql b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/describe_real_table.sql
index ae66c0279f55..f2161ef945d0 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/describe_real_table.sql
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/describe_real_table.sql
@@ -1,4 +1,4 @@
--- database: presto; groups: postgresql_connector; queryType: SELECT; tables: postgres.public.real_table_psql
+-- database: presto; groups: postgresql; queryType: SELECT; tables: postgres.public.real_table_psql
 --!
 describe postgresql.public.real_table_psql
 --!
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/describe_table.sql b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/describe_table.sql
index f0e4489c4aad..61b703a1cc82 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/describe_table.sql
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/describe_table.sql
@@ -1,4 +1,4 @@
--- database: presto; groups: postgresql_connector; queryType: SELECT; tables: postgres.public.workers_psql
+-- database: presto; groups: postgresql; queryType: SELECT; tables: postgres.public.workers_psql
 --!
 describe postgresql.public.workers_psql
 --!
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/join_postgres_to_postgres.sql b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/join_postgres_to_postgres.sql
index fdd4d61ec1f9..69b2a8f13e97 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/join_postgres_to_postgres.sql
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/join_postgres_to_postgres.sql
@@ -1,4 +1,4 @@
--- database: presto; groups: postgresql_connector; tables: postgres.public.workers_psql
+-- database: presto; groups: postgresql; tables: postgres.public.workers_psql
 --!
 select t1.last_name, t2.first_name from postgresql.public.workers_psql t1, postgresql.public.workers_psql t2 where t1.id_department = t2.id_employee
 --!
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/join_postgres_to_tpch.sql b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/join_postgres_to_tpch.sql
index 270d261cd4ae..49051b5bd10a 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/join_postgres_to_tpch.sql
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/join_postgres_to_tpch.sql
@@ -1,4 +1,4 @@
--- database: presto; groups: postgresql_connector; tables: postgres.public.workers_psql
+-- database: presto; groups: postgresql; tables: postgres.public.workers_psql
 --!
 select t1.first_name, t2.name from postgresql.public.workers_psql t1, tpch.sf1.nation t2 where t1.id_department = t2.nationkey
 --!
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/select.sql b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/select.sql
index a5f3e53b2bb7..d0baaac13f11 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/select.sql
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/select.sql
@@ -1,4 +1,4 @@
--- database: presto; groups: postgresql_connector; tables: postgres.public.workers_psql
+-- database: presto; groups: postgresql; tables: postgres.public.workers_psql
 --!
 select * from postgresql.public.workers_psql
 --!
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/select_real.sql b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/select_real.sql
index 007d145bc507..34dc88acc024 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/select_real.sql
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/select_real.sql
@@ -1,4 +1,4 @@
--- database: presto; groups: postgresql_connector; tables: postgres.public.real_table_psql
+-- database: presto; groups: postgresql; tables: postgres.public.real_table_psql
 --!
 select * from postgresql.public.real_table_psql
 --!
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/show_schemas.sql b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/show_schemas.sql
index ff637f122523..b14cdd9d97cd 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/show_schemas.sql
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/show_schemas.sql
@@ -1,4 +1,4 @@
--- database: presto; groups: postgresql_connector; queryType: SELECT;
+-- database: presto; groups: postgresql; queryType: SELECT;
 --!
 show schemas from postgresql
 --!
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/show_tables.sql b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/show_tables.sql
index 2d883cbc3548..35e307ed871f 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/show_tables.sql
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/connectors/postgresql/show_tables.sql
@@ -1,4 +1,4 @@
--- database: presto; groups: postgresql_connector; tables: postgres.public.datatype_psql,postgres.public.workers_psql,postgres.public.real_table_psql
+-- database: presto; groups: postgresql; tables: postgres.public.datatype_psql,postgres.public.workers_psql,postgres.public.real_table_psql
 -- queryType: SELECT;
 --!
 show tables from postgresql.public