diff --git a/src/datatype.c b/src/datatype.c
index f205812..5b3211f 100644
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -228,7 +228,7 @@ pg_tle_create_base_type_internal(Oid typeNamespace,
 	Oid			typeOid;
 	Oid			array_oid;
 	char	   *array_type;
-	ObjectAddress address;
+	ObjectAddress address PG_USED_FOR_ASSERTS_ONLY;
 	Oid			inputFuncParamType;
 	Oid			outputFuncParamType;
 	char	   *namespaceName;
diff --git a/test/expected/pg_tle_api.out b/test/expected/pg_tle_api.out
index e941055..8c34f30 100644
--- a/test/expected/pg_tle_api.out
+++ b/test/expected/pg_tle_api.out
@@ -253,6 +253,7 @@ SELECT pg_reload_conf();
  t
 (1 row)
 
+\c -
 DROP FUNCTION test_validuntil;
 DROP FUNCTION password_check_length_greater_than_8;
 DROP FUNCTION password_check_only_nums;
diff --git a/test/expected/pg_tle_api_clusterwide.out b/test/expected/pg_tle_api_clusterwide.out
index 6700054..0bdcfc9 100644
--- a/test/expected/pg_tle_api_clusterwide.out
+++ b/test/expected/pg_tle_api_clusterwide.out
@@ -258,6 +258,7 @@ SELECT pg_reload_conf();
  t
 (1 row)
 
+\c -
 DROP FUNCTION test_validuntil;
 DROP FUNCTION password_check_length_greater_than_8;
 DROP FUNCTION password_check_only_nums;
diff --git a/test/sql/pg_tle_api.sql b/test/sql/pg_tle_api.sql
index cac7e9a..ec72a60 100644
--- a/test/sql/pg_tle_api.sql
+++ b/test/sql/pg_tle_api.sql
@@ -155,6 +155,7 @@ DROP SCHEMA testuser_2;
 DROP ROLE testuser_2;
 ALTER SYSTEM RESET pgtle.enable_password_check;
 SELECT pg_reload_conf();
+\c -
 DROP FUNCTION test_validuntil;
 DROP FUNCTION password_check_length_greater_than_8;
 DROP FUNCTION password_check_only_nums;
diff --git a/test/sql/pg_tle_api_clusterwide.sql b/test/sql/pg_tle_api_clusterwide.sql
index 5d4a3d8..20120b4 100644
--- a/test/sql/pg_tle_api_clusterwide.sql
+++ b/test/sql/pg_tle_api_clusterwide.sql
@@ -165,6 +165,7 @@ DROP SCHEMA testuser_2;
 DROP ROLE testuser_2;
 ALTER SYSTEM RESET pgtle.enable_password_check;
 SELECT pg_reload_conf();
+\c -
 DROP FUNCTION test_validuntil;
 DROP FUNCTION password_check_length_greater_than_8;
 DROP FUNCTION password_check_only_nums;