diff --git a/.github/workflows/odbc-tests.yml b/.github/workflows/odbc-tests.yml
index bd8572c6fd..f519036cdb 100644
--- a/.github/workflows/odbc-tests.yml
+++ b/.github/workflows/odbc-tests.yml
@@ -58,7 +58,7 @@ jobs:
         if: steps.install-extensions.outcome == 'success' && steps.install-unix-odbc-driver.outcome=='success'
         run: |
           cd ~
-          wget https://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-16.00.0000.tar.gz
+          wget https://ftp.postgresql.org/pub/odbc/versions.old/src/psqlodbc-16.00.0000.tar.gz
           tar -zxvf psqlodbc-16.00.0000.tar.gz
           cd psqlodbc-16.00.0000
           ./configure
diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-UNSUPPORTED.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-UNSUPPORTED.out
index 8c1b0dd732..9b7596e307 100644
--- a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-UNSUPPORTED.out
+++ b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-UNSUPPORTED.out
@@ -1673,7 +1673,7 @@ INSERT INTO t_unsupported_cac1 VALUES (0, 0);
 GO
 ~~ERROR (Code: 547)~~
 
-~~ERROR (Message: new row for relation "t_unsupported_cac1" violates check constraint "chk1t_unsupported_cac1848ea8bb1121ee393ad72ae0d412d8d2")~~
+~~ERROR (Message: new row for relation "t_unsupported_cac1" violates check constraint "chk1t_unsupported_cac1")~~
 
 DROP TABLE t_unsupported_cac1
 GO
@@ -1700,7 +1700,7 @@ ALTER TABLE t_unsupported_cec1 ADD constraint chk1 check (a > 0)
 GO
 ~~ERROR (Code: 547)~~
 
-~~ERROR (Message: check constraint "chk1t_unsupported_cec1848ea8bb1121ee393ad72ae0d412d8d2" of relation "t_unsupported_cec1" is violated by some row)~~
+~~ERROR (Message: check constraint "chk1" of relation "t_unsupported_cec1" is violated by some row)~~
 
 ALTER TABLE t_unsupported_cec1 CHECK constraint chk1
 GO
@@ -1729,7 +1729,7 @@ ALTER TABLE t_unsupported_cec1 ADD constraint chk1 check (a > 0)
 GO
 ~~ERROR (Code: 547)~~
 
-~~ERROR (Message: check constraint "chk1t_unsupported_cec1848ea8bb1121ee393ad72ae0d412d8d2" of relation "t_unsupported_cec1" is violated by some row)~~
+~~ERROR (Message: check constraint "chk1" of relation "t_unsupported_cec1" is violated by some row)~~
 
 ALTER TABLE t_unsupported_cec1 CHECK constraint chk1
 GO
diff --git a/test/python/expected/pyodbc/ddl_func_proc.out b/test/python/expected/pyodbc/ddl_func_proc.out
index 18668576b8..56745598f4 100644
--- a/test/python/expected/pyodbc/ddl_func_proc.out
+++ b/test/python/expected/pyodbc/ddl_func_proc.out
@@ -7,7 +7,7 @@ CREATE TABLE [dbo].[routines_customers](
 	[city] [char](50) NULL,
 	[state] [char](25) NULL,
 	[zip_code] [char](10) NULL,
- CONSTRAINT [customers_pkroutines_customers248e85dd01b015e3396e8567c240879b] PRIMARY KEY NONCLUSTERED 
+ CONSTRAINT [customers_pk] PRIMARY KEY NONCLUSTERED 
 (
 	[customer_id] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
@@ -197,7 +197,7 @@ BEGIN
 END;
 GO
 
-ALTER TABLE [dbo].[routines_customers] ADD  CONSTRAINT [customers_pkroutines_customers248e85dd01b015e3396e8567c240879b] PRIMARY KEY NONCLUSTERED 
+ALTER TABLE [dbo].[routines_customers] ADD  CONSTRAINT [customers_pk] PRIMARY KEY NONCLUSTERED 
 (
 	[customer_id] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
diff --git a/test/python/expected/pyodbc/ddl_tables_index.out b/test/python/expected/pyodbc/ddl_tables_index.out
index c8140963e2..ab0e39671f 100644
--- a/test/python/expected/pyodbc/ddl_tables_index.out
+++ b/test/python/expected/pyodbc/ddl_tables_index.out
@@ -34,7 +34,7 @@ CREATE TABLE [dbo].[babel_4817_t2](
 	[col6] [int] NULL,
 	[col7] [int] IDENTITY(1,1) NOT NULL,
 	[col8] [int] NOT NULL,
- CONSTRAINT [babel_4817_t2_pkbabel_4817_t2405f712bf0a4067d413068dcbaf9fc11] PRIMARY KEY NONCLUSTERED 
+ CONSTRAINT [babel_4817_t2_pk] PRIMARY KEY NONCLUSTERED 
 (
 	[col3] ASC,
 	[col7] ASC
@@ -185,8 +185,8 @@ CREATE TABLE [dbo].[test_null](
 	[b] [int] NULL
 ) ON [PRIMARY]
 
-ALTER TABLE [dbo].[test_null]  WITH CHECK ADD  CONSTRAINT [constraint1test_null987b8e55c77de33d095778885ecd84f4] CHECK  (((a > 10)))
-ALTER TABLE [dbo].[test_null] CHECK CONSTRAINT [constraint1test_null987b8e55c77de33d095778885ecd84f4]
+ALTER TABLE [dbo].[test_null]  WITH CHECK ADD  CONSTRAINT [constraint1] CHECK  (((a > 10)))
+ALTER TABLE [dbo].[test_null] CHECK CONSTRAINT [constraint1]
 ALTER TABLE [dbo].[test_null]  WITH CHECK ADD  CONSTRAINT [test_null_a_check] CHECK  (((a IS NOT NULL)))
 ALTER TABLE [dbo].[test_null] CHECK CONSTRAINT [test_null_a_check]
 GO
@@ -275,7 +275,7 @@ GO
 
 SET ANSI_PADDING ON
 
-ALTER TABLE [dbo].[babel_4817_t2] ADD  CONSTRAINT [babel_4817_t2_pkbabel_4817_t2405f712bf0a4067d413068dcbaf9fc11] PRIMARY KEY NONCLUSTERED 
+ALTER TABLE [dbo].[babel_4817_t2] ADD  CONSTRAINT [babel_4817_t2_pk] PRIMARY KEY NONCLUSTERED 
 (
 	[col3] ASC,
 	[col7] ASC