diff --git a/config/database.yml.decomposed-clusterwide-postgresql b/config/database.yml.decomposed-clusterwide-postgresql
index 6439788524e5e5238ee97fab1f7da14e314d6291..63d35184953f6e0849ca8efe228be51872bc14ce 100644
--- a/config/database.yml.decomposed-clusterwide-postgresql
+++ b/config/database.yml.decomposed-clusterwide-postgresql
@@ -60,6 +60,7 @@ test:
     username: postgres
     password:
     prepared_statements: false
+    reaping_frequency: nil
     variables:
       statement_timeout: 15s
   ci:
@@ -68,19 +69,23 @@ test:
     username: postgres
     password:
     prepared_statements: false
+    reaping_frequency: nil
     variables:
       statement_timeout: 15s
   main_clusterwide:
     <<: *main
     database_tasks: false
+    reaping_frequency: nil
   geo:
     <<: *defaults
     database: gitlabhq_geo_test
     username: postgres
     password:
+    reaping_frequency: nil
   embedding:
     <<: *defaults
     database: gitlabhq_embedding_test
     username: postgres
     password:
+    reaping_frequency: nil
 
diff --git a/config/database.yml.decomposed-postgresql b/config/database.yml.decomposed-postgresql
index 3b5d1ff2ed5623211a489c04b5a5a9da1627e23e..a2f9e42d620a37f5e503037437bcce44b0dcd37b 100644
--- a/config/database.yml.decomposed-postgresql
+++ b/config/database.yml.decomposed-postgresql
@@ -84,6 +84,7 @@ test: &test
     password:
     host: localhost
     prepared_statements: false
+    reaping_frequency: nil
     variables:
       statement_timeout: 15s
   ci:
@@ -94,6 +95,7 @@ test: &test
     password:
     host: localhost
     prepared_statements: false
+    reaping_frequency: nil
     variables:
       statement_timeout: 15s
   geo:
@@ -103,6 +105,7 @@ test: &test
     username: postgres
     password:
     host: localhost
+    reaping_frequency: nil
   embedding:
     adapter: postgresql
     encoding: unicode
@@ -110,3 +113,4 @@ test: &test
     username: postgres
     password:
     host: localhost
+    reaping_frequency: nil
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index b210b9c412bc4431dca2d1ee05e4b5da43201c2c..da9f458ff0915dd52f40d4ccdec9293b6506420f 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -104,6 +104,7 @@ test: &test
     password:
     host: localhost
     prepared_statements: false
+    reaping_frequency: nil
     variables:
       statement_timeout: 15s
   ci:
@@ -115,6 +116,7 @@ test: &test
     password:
     host: localhost
     prepared_statements: false
+    reaping_frequency: nil
     variables:
       statement_timeout: 15s
   geo:
@@ -124,6 +126,7 @@ test: &test
     username: postgres
     password:
     host: localhost
+    reaping_frequency: nil
   embedding:
     adapter: postgresql
     encoding: unicode
@@ -131,3 +134,4 @@ test: &test
     username: postgres
     password:
     host: localhost
+    reaping_frequency: nil