diff --git a/addons/base_geolocalize/models/res_partner.py b/addons/base_geolocalize/models/res_partner.py
index 278eecfae72..da82ce2cfe4 100644
--- a/addons/base_geolocalize/models/res_partner.py
+++ b/addons/base_geolocalize/models/res_partner.py
@@ -1,4 +1,8 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 from odoo import api, fields, models, _
+from odoo.tools import config
 
 
 class ResPartner(models.Model):
@@ -29,6 +33,10 @@ class ResPartner(models.Model):
 
     def geo_localize(self):
         # We need country names in English below
+        if not self._context.get('force_geo_localize') \
+                and (self._context.get('import_file') \
+                     or any(config[key] for key in ['test_enable', 'test_file', 'init', 'update'])):
+            return False
         partners_not_geo_localized = self.env['res.partner']
         for partner in self.with_context(lang='en_US'):
             result = self._geo_localize(partner.street,
diff --git a/addons/website_crm_partner_assign/tests/test_partner_assign.py b/addons/website_crm_partner_assign/tests/test_partner_assign.py
index 60fba253dbe..b40871f2974 100644
--- a/addons/website_crm_partner_assign/tests/test_partner_assign.py
+++ b/addons/website_crm_partner_assign/tests/test_partner_assign.py
@@ -61,7 +61,8 @@ class TestPartnerAssign(TransactionCase):
 
         # In order to test find nearest Partner functionality and assign to opportunity,
         # I Set Geo Lattitude and Longitude according to partner address.
-        partner_be.geo_localize()
+        # YTI Note: We should probably mock the call
+        partner_be.with_context(force_geo_localize=True).geo_localize()
 
         # I check Geo Latitude and Longitude of partner after set
         self.assertTrue(50 < partner_be.partner_latitude < 51, "Latitude is wrong: 50 < %s < 51" % partner_be.partner_latitude)