diff --git a/base_location/README.rst b/base_location/README.rst
index f9d4d0dcc..d3434c556 100644
--- a/base_location/README.rst
+++ b/base_location/README.rst
@@ -40,7 +40,8 @@ Contributors
 * Ignacio Ibeas (Acysos S.L.)
 * Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
 * Alejandro Santana <alejandrosantana@anubia.es>
-- Sandy Carter <sandy.carter@savoirfairelinux.com>
+* Sandy Carter <sandy.carter@savoirfairelinux.com>
+* Yannick Vaucher <yannick.vaucher@camptocamp.com>
 
 Icon
 ----
diff --git a/base_location/__openerp__.py b/base_location/__openerp__.py
index 313cd4324..b987141b9 100644
--- a/base_location/__openerp__.py
+++ b/base_location/__openerp__.py
@@ -36,6 +36,7 @@
         'Ignacio Ibeas (Acysos S.L.)',
         'Alejandro Santana <alejandrosantana@anubia.es>',
         'Sandy Carter <sandy.carter@savoirfairelinux.com>',
+        'Yannick Vaucher <yannick.vaucher@camptocamp.com>',
     ],
     'summary': '''Enhanced zip/npa management system''',
     'website': 'http://www.camptocamp.com',
diff --git a/base_location/tests/__init__.py b/base_location/tests/__init__.py
new file mode 100644
index 000000000..78c6dfa4c
--- /dev/null
+++ b/base_location/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# © 2015 Yannick Vaucher (Camptocamp)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import test_completion
diff --git a/base_location/tests/test_completion.py b/base_location/tests/test_completion.py
new file mode 100644
index 000000000..30ea0a743
--- /dev/null
+++ b/base_location/tests/test_completion.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# © 2015 Yannick Vaucher (Camptocamp)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+"""Test a city completion and onchanges."""
+
+from openerp.tests.common import TransactionCase
+
+
+class TestCompletion(TransactionCase):
+
+    def test_onchange_better_zip_state_id(self):
+        """ Test onchange on res.better.zip """
+        usa_MA = self.env.ref('base.state_us_34')
+        self.better_zip1.state_id = usa_MA
+        self.better_zip1.onchange_state_id()
+        self.assertEqual(self.better_zip1.country_id, usa_MA.country_id)
+
+    def test_onchange_partner_city_completion(self):
+        self.partner1.zip_id = self.better_zip1
+        self.partner1.onchange_zip_id()
+        self.assertEqual(self.partner1.zip, self.better_zip1.name)
+        self.assertEqual(self.partner1.city, self.better_zip1.city)
+        self.assertEqual(self.partner1.state_id, self.better_zip1.state_id)
+        self.assertEqual(self.partner1.country_id, self.better_zip1.country_id)
+
+    def test_onchange_company_city_completion(self):
+        self.company.better_zip_id = self.better_zip1
+        self.company.on_change_city()
+        self.assertEqual(self.company.zip, self.better_zip1.name)
+        self.assertEqual(self.company.city, self.better_zip1.city)
+        self.assertEqual(self.company.state_id, self.better_zip1.state_id)
+        self.assertEqual(self.company.country_id, self.better_zip1.country_id)
+
+    def setUp(self):
+        super(TestCompletion, self).setUp()
+        state_vd = self.env['res.country.state'].create({
+            'name': 'Vaud',
+            'code': 'VD',
+            'country_id': self.ref('base.ch'),
+        })
+        self.company = self.env.ref('base.main_company')
+        self.better_zip1 = self.env['res.better.zip'].create({
+            'name': 1000,
+            'city': 'Lausanne',
+            'state_id': state_vd.id,
+            'country_id': self.ref('base.ch'),
+        })
+        self.partner1 = self.env['res.partner'].create({
+            'name': 'Camptocamp',
+        })