diff --git a/.copier-answers.yml b/.copier-answers.yml
index a1b878f5f..e361aecf2 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -14,7 +14,8 @@ include_wkhtmltopdf: false
 odoo_version: 15.0
 org_name: Odoo Community Association (OCA)
 org_slug: OCA
-rebel_module_groups: []
+rebel_module_groups:
+- database_cleanup
 repo_description: 'TODO: add repo description.'
 repo_name: server-tools
 repo_slug: server-tools
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7fc809fb4..e1420f19a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,9 +36,18 @@ jobs:
       matrix:
         include:
           - container: ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest
+            include: "database_cleanup"
             makepot: "true"
             name: test with Odoo
           - container: ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest
+            include: "database_cleanup"
+            name: test with OCB
+          - container: ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest
+            exclude: "database_cleanup"
+            makepot: "true"
+            name: test with Odoo
+          - container: ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest
+            exclude: "database_cleanup"
             name: test with OCB
     services:
       postgres:
@@ -49,6 +58,9 @@ jobs:
           POSTGRES_DB: odoo
         ports:
           - 5432:5432
+    env:
+      INCLUDE: "${{ matrix.include }}"
+      EXCLUDE: "${{ matrix.exclude }}"
     steps:
       - uses: actions/checkout@v2
         with: