diff --git a/base_partner_merge/base_partner_merge.py b/base_partner_merge/base_partner_merge.py
index 9daadd71e..416430d0b 100644
--- a/base_partner_merge/base_partner_merge.py
+++ b/base_partner_merge/base_partner_merge.py
@@ -26,7 +26,9 @@ _logger = logging.getLogger('base.partner.merge')
 
 
 # http://www.php2python.com/wiki/function.html-entity-decode/
-def html_entity_decode_char(m, defs=htmlentitydefs.entitydefs):
+def html_entity_decode_char(m, defs=None):
+    if defs is None:
+        defs = htmlentitydefs.entitydefs
     try:
         return defs[m.group(1)]
     except KeyError:
diff --git a/firstname_display_name_trigger/res_partner.py b/firstname_display_name_trigger/res_partner.py
index 815913292..e8fa642ae 100644
--- a/firstname_display_name_trigger/res_partner.py
+++ b/firstname_display_name_trigger/res_partner.py
@@ -56,7 +56,7 @@ class ResPartner(orm.Model):
             lambda self, cr, uid, ids, context=None:
             self.search(cr, uid, [
                 ('id', 'child_of', ids)
-                ]),
+            ]),
             ['parent_id', 'is_company', 'name', 'firstname', 'lastname'],
             10
         )
diff --git a/passport/tests/test_passport.py b/passport/tests/test_passport.py
index 1dd5759e7..b2b7a7431 100644
--- a/passport/tests/test_passport.py
+++ b/passport/tests/test_passport.py
@@ -31,10 +31,12 @@ class Base_Test_passport(TransactionCase):
     Inherit from this and setup values.
     """
 
-    def setUp(self, vals={}):
+    def setUp(self, vals=None):
         """
         Setting up passport.
         """
+        if vals is None:
+            vals = {}
         # Default test values
         self.vals = {'name': 'This is a test passport name',
                      'number': 'A200124789',