diff --git a/ci_scripts/setup-keyring-servers.sh b/ci_scripts/setup-keyring-servers.sh
index 962f8592443..4a9a5aba52a 100755
--- a/ci_scripts/setup-keyring-servers.sh
+++ b/ci_scripts/setup-keyring-servers.sh
@@ -15,6 +15,7 @@ wget https://raw.githubusercontent.com/OpenKMIP/PyKMIP/refs/heads/master/example
 cd ..
 
 echo $SCRIPT_DIR
+rm -f /tmp/pykmip.db
 pykmip-server -f "$SCRIPT_DIR/../contrib/pg_tde/pykmip-server.conf" -l /tmp/kmip-server.log &
 
 CLUSTER_INFO=$(mktemp)
diff --git a/ci_scripts/tde_setup.sql b/ci_scripts/tde_setup.sql
index fd084c96462..c4d32890427 100644
--- a/ci_scripts/tde_setup.sql
+++ b/ci_scripts/tde_setup.sql
@@ -1,4 +1,5 @@
 CREATE SCHEMA IF NOT EXISTS tde;
 CREATE EXTENSION IF NOT EXISTS pg_tde SCHEMA tde;
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 SELECT tde.pg_tde_add_database_key_provider_file('reg_file-vault', '/tmp/pg_tde_test_keyring.per');
 SELECT tde.pg_tde_set_key_using_database_key_provider('test-db-key', 'reg_file-vault');
diff --git a/ci_scripts/tde_setup_global.sql b/ci_scripts/tde_setup_global.sql
index 364b34c5f60..de64310989d 100644
--- a/ci_scripts/tde_setup_global.sql
+++ b/ci_scripts/tde_setup_global.sql
@@ -1,6 +1,7 @@
 CREATE SCHEMA tde;
 CREATE EXTENSION IF NOT EXISTS pg_tde SCHEMA tde;
 
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 SELECT tde.pg_tde_add_global_key_provider_file('reg_file-global', '/tmp/pg_tde_test_keyring.per');
 SELECT tde.pg_tde_set_server_key_using_global_key_provider('server-key', 'reg_file-global');
 ALTER SYSTEM SET pg_tde.wal_encrypt = on;
diff --git a/contrib/pg_tde/expected/access_control.out b/contrib/pg_tde/expected/access_control.out
index de266f17e88..da19b792981 100644
--- a/contrib/pg_tde/expected/access_control.out
+++ b/contrib/pg_tde/expected/access_control.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('local-file-provider', '/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 
diff --git a/contrib/pg_tde/expected/alter_index.out b/contrib/pg_tde/expected/alter_index.out
index dc3c181acdd..83121582d02 100644
--- a/contrib/pg_tde/expected/alter_index.out
+++ b/contrib/pg_tde/expected/alter_index.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 
diff --git a/contrib/pg_tde/expected/cache_alloc.out b/contrib/pg_tde/expected/cache_alloc.out
index 86e060fae58..31801767ead 100644
--- a/contrib/pg_tde/expected/cache_alloc.out
+++ b/contrib/pg_tde/expected/cache_alloc.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 -- Just checking there are no mem debug WARNINGs during the cache population
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
diff --git a/contrib/pg_tde/expected/change_access_method.out b/contrib/pg_tde/expected/change_access_method.out
index fd95f35489c..4e18699bf1c 100644
--- a/contrib/pg_tde/expected/change_access_method.out
+++ b/contrib/pg_tde/expected/change_access_method.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 
diff --git a/contrib/pg_tde/expected/create_database.out b/contrib/pg_tde/expected/create_database.out
index 83944edd3e3..cf5827b81a1 100644
--- a/contrib/pg_tde/expected/create_database.out
+++ b/contrib/pg_tde/expected/create_database.out
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/template_provider_global.per'
+\! rm -f '/tmp/template_provider.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 CREATE DATABASE template_db;
 SELECT current_database() AS regress_database
diff --git a/contrib/pg_tde/expected/default_principal_key.out b/contrib/pg_tde/expected/default_principal_key.out
index 6c5c92509a6..b372401b9f7 100644
--- a/contrib/pg_tde/expected/default_principal_key.out
+++ b/contrib/pg_tde/expected/default_principal_key.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_regression_default_key.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 CREATE EXTENSION IF NOT EXISTS pg_buffercache;
 SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regression_default_key.per');
diff --git a/contrib/pg_tde/expected/delete_principal_key.out b/contrib/pg_tde/expected/delete_principal_key.out
index 3c6319e7b3e..7faf2b9e446 100644
--- a/contrib/pg_tde/expected/delete_principal_key.out
+++ b/contrib/pg_tde/expected/delete_principal_key.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_global_key_provider_file 
diff --git a/contrib/pg_tde/expected/insert_update_delete.out b/contrib/pg_tde/expected/insert_update_delete.out
index 9db4133a073..8710a076b5c 100644
--- a/contrib/pg_tde/expected/insert_update_delete.out
+++ b/contrib/pg_tde/expected/insert_update_delete.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 
diff --git a/contrib/pg_tde/expected/key_provider.out b/contrib/pg_tde/expected/key_provider.out
index d517e74596f..91850794e1e 100644
--- a/contrib/pg_tde/expected/key_provider.out
+++ b/contrib/pg_tde/expected/key_provider.out
@@ -1,3 +1,7 @@
+\! rm -f '/tmp/db-provider-file'
+\! rm -f '/tmp/global-provider-file-1'
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+\! rm -f '/tmp/pg_tde_test_keyring2.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT  * FROM pg_tde_key_info();
  key_name | provider_name | provider_id | key_creation_time 
diff --git a/contrib/pg_tde/expected/partition_table.out b/contrib/pg_tde/expected/partition_table.out
index 704bb98598c..30f03958536 100644
--- a/contrib/pg_tde/expected/partition_table.out
+++ b/contrib/pg_tde/expected/partition_table.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_keyring.per'
 CREATE EXTENSION pg_tde;
 SELECT pg_tde_add_database_key_provider_file('database_keyring_provider','/tmp/pg_tde_keyring.per');
  pg_tde_add_database_key_provider_file 
diff --git a/contrib/pg_tde/expected/pg_tde_is_encrypted.out b/contrib/pg_tde/expected/pg_tde_is_encrypted.out
index f3916e4734a..f3f7b1e9804 100644
--- a/contrib/pg_tde/expected/pg_tde_is_encrypted.out
+++ b/contrib/pg_tde/expected/pg_tde_is_encrypted.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 
diff --git a/contrib/pg_tde/expected/recreate_storage.out b/contrib/pg_tde/expected/recreate_storage.out
index 235e75b7047..87dc760c31e 100644
--- a/contrib/pg_tde/expected/recreate_storage.out
+++ b/contrib/pg_tde/expected/recreate_storage.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 
diff --git a/contrib/pg_tde/expected/tablespace.out b/contrib/pg_tde/expected/tablespace.out
index de34caa969d..93f790d4f81 100644
--- a/contrib/pg_tde/expected/tablespace.out
+++ b/contrib/pg_tde/expected/tablespace.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 
diff --git a/contrib/pg_tde/expected/toast_decrypt.out b/contrib/pg_tde/expected/toast_decrypt.out
index e7d2d11370e..938aa01f28f 100644
--- a/contrib/pg_tde/expected/toast_decrypt.out
+++ b/contrib/pg_tde/expected/toast_decrypt.out
@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 
diff --git a/contrib/pg_tde/sql/access_control.sql b/contrib/pg_tde/sql/access_control.sql
index b8ac7aff0ec..7ffa455cdf7 100644
--- a/contrib/pg_tde/sql/access_control.sql
+++ b/contrib/pg_tde/sql/access_control.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('local-file-provider', '/tmp/pg_tde_test_keyring.per');
diff --git a/contrib/pg_tde/sql/alter_index.sql b/contrib/pg_tde/sql/alter_index.sql
index 794161bbd0e..7af5617ea73 100644
--- a/contrib/pg_tde/sql/alter_index.sql
+++ b/contrib/pg_tde/sql/alter_index.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
diff --git a/contrib/pg_tde/sql/cache_alloc.sql b/contrib/pg_tde/sql/cache_alloc.sql
index 745fdacfc18..acaf5146711 100644
--- a/contrib/pg_tde/sql/cache_alloc.sql
+++ b/contrib/pg_tde/sql/cache_alloc.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 -- Just checking there are no mem debug WARNINGs during the cache population
 
 CREATE EXTENSION IF NOT EXISTS pg_tde;
diff --git a/contrib/pg_tde/sql/change_access_method.sql b/contrib/pg_tde/sql/change_access_method.sql
index cc3f2eb153f..6949ea7054a 100644
--- a/contrib/pg_tde/sql/change_access_method.sql
+++ b/contrib/pg_tde/sql/change_access_method.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');
diff --git a/contrib/pg_tde/sql/create_database.sql b/contrib/pg_tde/sql/create_database.sql
index 77c7aaf84a8..4ef8d4ed6fe 100644
--- a/contrib/pg_tde/sql/create_database.sql
+++ b/contrib/pg_tde/sql/create_database.sql
@@ -1,3 +1,6 @@
+\! rm -f '/tmp/template_provider_global.per'
+\! rm -f '/tmp/template_provider.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 CREATE DATABASE template_db;
diff --git a/contrib/pg_tde/sql/default_principal_key.sql b/contrib/pg_tde/sql/default_principal_key.sql
index 3a39fa87fc0..29422cd3d57 100644
--- a/contrib/pg_tde/sql/default_principal_key.sql
+++ b/contrib/pg_tde/sql/default_principal_key.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_regression_default_key.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 CREATE EXTENSION IF NOT EXISTS pg_buffercache;
 
diff --git a/contrib/pg_tde/sql/delete_principal_key.sql b/contrib/pg_tde/sql/delete_principal_key.sql
index f058a7f5060..9c2aa36271a 100644
--- a/contrib/pg_tde/sql/delete_principal_key.sql
+++ b/contrib/pg_tde/sql/delete_principal_key.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');
diff --git a/contrib/pg_tde/sql/insert_update_delete.sql b/contrib/pg_tde/sql/insert_update_delete.sql
index 9efd91a809d..fa7f330a239 100644
--- a/contrib/pg_tde/sql/insert_update_delete.sql
+++ b/contrib/pg_tde/sql/insert_update_delete.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
diff --git a/contrib/pg_tde/sql/key_provider.sql b/contrib/pg_tde/sql/key_provider.sql
index 9cfb21ee2f5..a7cd4661274 100644
--- a/contrib/pg_tde/sql/key_provider.sql
+++ b/contrib/pg_tde/sql/key_provider.sql
@@ -1,3 +1,8 @@
+\! rm -f '/tmp/db-provider-file'
+\! rm -f '/tmp/global-provider-file-1'
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+\! rm -f '/tmp/pg_tde_test_keyring2.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT  * FROM pg_tde_key_info();
diff --git a/contrib/pg_tde/sql/partition_table.sql b/contrib/pg_tde/sql/partition_table.sql
index b77b1f4c354..9889c1158f6 100644
--- a/contrib/pg_tde/sql/partition_table.sql
+++ b/contrib/pg_tde/sql/partition_table.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_keyring.per'
+
 CREATE EXTENSION pg_tde;
 SELECT pg_tde_add_database_key_provider_file('database_keyring_provider','/tmp/pg_tde_keyring.per');
 SELECT pg_tde_set_key_using_database_key_provider('table_key','database_keyring_provider');
diff --git a/contrib/pg_tde/sql/pg_tde_is_encrypted.sql b/contrib/pg_tde/sql/pg_tde_is_encrypted.sql
index 19e57b1689b..fea488ed2ad 100644
--- a/contrib/pg_tde/sql/pg_tde_is_encrypted.sql
+++ b/contrib/pg_tde/sql/pg_tde_is_encrypted.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
diff --git a/contrib/pg_tde/sql/recreate_storage.sql b/contrib/pg_tde/sql/recreate_storage.sql
index 7a19ad35444..82fa8c3c73b 100644
--- a/contrib/pg_tde/sql/recreate_storage.sql
+++ b/contrib/pg_tde/sql/recreate_storage.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
diff --git a/contrib/pg_tde/sql/tablespace.sql b/contrib/pg_tde/sql/tablespace.sql
index 7e2abce87ca..d7632f6670a 100644
--- a/contrib/pg_tde/sql/tablespace.sql
+++ b/contrib/pg_tde/sql/tablespace.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
diff --git a/contrib/pg_tde/sql/toast_decrypt.sql b/contrib/pg_tde/sql/toast_decrypt.sql
index 4cd6cf513f6..1dfc671cb5b 100644
--- a/contrib/pg_tde/sql/toast_decrypt.sql
+++ b/contrib/pg_tde/sql/toast_decrypt.sql
@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');