diff --git a/setup/package.py b/setup/package.py
index 97a52d7419e4c..45441976c06d5 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -297,7 +297,7 @@ def start_test(self):
             'service postgresql start',
             'pip3 install /data/src/odoo_%s.%s.tar.gz' % (VERSION, TSTAMP),
             'su postgres -s /bin/bash -c "createuser -s odoo"',
-            'su postgres -s /bin/bash -c "createdb mycompany"',
+            'su odoo -s /bin/bash -c "createdb mycompany"',
             'su odoo -s /bin/bash -c "odoo -d mycompany -i base --stop-after-init"',
             'su odoo -s /bin/bash -c "odoo -d mycompany --pidfile=/data/src/odoo.pid"',
         ]
@@ -364,7 +364,8 @@ def start_test(self):
         cmds = [
             'su postgres -c "/usr/bin/pg_ctl -D /var/lib/postgres/data start"',
             'sleep 5',
-            'su postgres -c "createdb mycompany"',
+            'su postgres -c "createuser -s odoo"',
+            'su odoo -c "createdb mycompany"',
             'dnf install -d 0 -e 0 /data/src/odoo_%s.%s.rpm -y' % (VERSION, TSTAMP),
             'su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany -i base --stop-after-init"',
             'su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany --pidfile=/data/src/odoo.pid"',
diff --git a/setup/rpm/odoo.spec b/setup/rpm/odoo.spec
index 6584561cc0ba9..1b582502885ce 100644
--- a/setup/rpm/odoo.spec
+++ b/setup/rpm/odoo.spec
@@ -1,6 +1,7 @@
 %global name odoo
 %global release 1
 %global unmangled_version %{version}
+%global __requires_exclude ^.*odoo/addons/mail/static/scripts/odoo-mailgate.py$
 
 Summary: Odoo Server
 Name: %{name}