diff --git a/do_tests.py b/do_tests.py
index 2c3b2dfcafdd0ae4674ea8e974e84b55741afec9_ZG9fdGVzdHMucHk=..905fa70d2e27d6c6552f2ecdbddce3285d3c3795_ZG9fdGVzdHMucHk= 100755
--- a/do_tests.py
+++ b/do_tests.py
@@ -203,10 +203,6 @@
         if not odoo_db_user:
             if c.has_option('options', 'db_user'):
                 odoo_db_user = c.get('options', 'db_user')
-            elif start_postgresql:
-                odoo_db_user = 'odoo'
-            else:
-                _logger.warning("No database user found or given")
         if not odoo_db_password:
             if c.has_option('options', 'db_password'):
                 odoo_db_password = c.get('options', 'db_password')
@@ -210,10 +206,6 @@
         if not odoo_db_password:
             if c.has_option('options', 'db_password'):
                 odoo_db_password = c.get('options', 'db_password')
-            elif start_postgresql:
-                odoo_db_password = 'odoo'
-            else:
-                _logger.warning("No database password found or given")
         if (
             c.has_option('options', 'unaccent') and
             c.getboolean('options', 'unaccent')
@@ -223,6 +215,17 @@
         _logger.debug('No sample configuration %s', sample_conf)
         extensions.append('unaccent')
 
+    if not odoo_db_user:
+        if start_postgresql:
+            odoo_db_user = 'odoo'
+        else:
+            _logger.warning("No database user found or given")
+    if not odoo_db_password:
+        if start_postgresql:
+            odoo_db_password = 'odoo'
+        else:
+            _logger.warning("No database password found or given")
+
     # Do stuff
 
     if nmspc.docker: