diff --git a/tests/postgresql/postgresql10.recipe b/tests/postgresql/postgresql10.recipe
index 3c2c171e0..4bd0b83aa 100644
--- a/tests/postgresql/postgresql10.recipe
+++ b/tests/postgresql/postgresql10.recipe
@@ -193,4 +193,5 @@ command "service {service_name} initdb" "Database initialization"
   !wait-service {service_name}
 
 command:teardown "-" "Data cleanup"
-  cleanup {data_dir}
+  cleanup {data_dir}/data
+  cleanup {data_dir}/backups
diff --git a/tests/postgresql/postgresql11.recipe b/tests/postgresql/postgresql11.recipe
index c07f59cf6..c62a1b91d 100644
--- a/tests/postgresql/postgresql11.recipe
+++ b/tests/postgresql/postgresql11.recipe
@@ -202,4 +202,5 @@ command "service {service_name} initdb" "Database initialization"
   !wait-service {service_name}
 
 command:teardown "-" "Data cleanup"
-  cleanup {data_dir}
+  cleanup {data_dir}/data
+  cleanup {data_dir}/backups
diff --git a/tests/postgresql/postgresql12.recipe b/tests/postgresql/postgresql12.recipe
index 3a1bde682..334212763 100644
--- a/tests/postgresql/postgresql12.recipe
+++ b/tests/postgresql/postgresql12.recipe
@@ -202,4 +202,5 @@ command "service {service_name} initdb" "Database initialization"
   !wait-service {service_name}
 
 command:teardown "-" "Data cleanup"
-  cleanup {data_dir}
+  cleanup {data_dir}/data
+  cleanup {data_dir}/backups
diff --git a/tests/postgresql/postgresql13.recipe b/tests/postgresql/postgresql13.recipe
index a858abdeb..e8555ad92 100644
--- a/tests/postgresql/postgresql13.recipe
+++ b/tests/postgresql/postgresql13.recipe
@@ -204,4 +204,5 @@ command "service {service_name} initdb" "Database initialization"
   !wait-service {service_name}
 
 command:teardown "-" "Data cleanup"
-  cleanup {data_dir}
+  cleanup {data_dir}/data
+  cleanup {data_dir}/backups
diff --git a/tests/postgresql/postgresql14.recipe b/tests/postgresql/postgresql14.recipe
index 888e12ca1..6394cbf80 100644
--- a/tests/postgresql/postgresql14.recipe
+++ b/tests/postgresql/postgresql14.recipe
@@ -204,4 +204,5 @@ command "service {service_name} initdb" "Database initialization"
   !wait-service {service_name}
 
 command:teardown "-" "Data cleanup"
-  cleanup {data_dir}
+  cleanup {data_dir}/data
+  cleanup {data_dir}/backups
diff --git a/tests/postgresql/postgresql15.recipe b/tests/postgresql/postgresql15.recipe
index 1328945ed..9905915f7 100644
--- a/tests/postgresql/postgresql15.recipe
+++ b/tests/postgresql/postgresql15.recipe
@@ -204,4 +204,5 @@ command "service {service_name} initdb" "Database initialization"
   !wait-service {service_name}
 
 command:teardown "-" "Data cleanup"
-  cleanup {data_dir}
+  cleanup {data_dir}/data
+  cleanup {data_dir}/backups
diff --git a/tests/postgresql/postgresql16.recipe b/tests/postgresql/postgresql16.recipe
index 61a03e25f..e962dad34 100644
--- a/tests/postgresql/postgresql16.recipe
+++ b/tests/postgresql/postgresql16.recipe
@@ -204,4 +204,5 @@ command "service {service_name} initdb" "Database initialization"
   !wait-service {service_name}
 
 command:teardown "-" "Data cleanup"
-  cleanup {data_dir}
+  cleanup {data_dir}/data
+  cleanup {data_dir}/backups