diff --git a/address.py b/address.py
index 2f5dcc8e66..7e1f033578 100644
--- a/address.py
+++ b/address.py
@@ -20,7 +20,7 @@ class Address:
     @fields.depends('street', 'zip', 'city', 'country', 'subdivision')
     def on_change_with_google_maps_url(self, name=None):
         lang = Transaction().language[:2]
-        url = ''.join(self.full_address.splitlines())
+        url = ' '.join(self.full_address.splitlines())
         if url.strip():
             if isinstance(url, str) and sys.version_info < (3,):
                 url = url.encode('utf-8')
diff --git a/tests/test_google_maps.py b/tests/test_google_maps.py
index dba7b81d0e..9d9cbc3fa6 100644
--- a/tests/test_google_maps.py
+++ b/tests/test_google_maps.py
@@ -15,10 +15,15 @@ class GoogleMapsTestCase(ModuleTestCase):
         "Test Google Maps URL"
         pool = Pool()
         Address = pool.get('party.address')
+        Party = pool.get('party.party')
+        party = Party()
+        party.save()
         address = Address()
+        address.party = party
         address.street = "300 Cliff Street"
         address.zip = "18503"
         address.city = "Scranton"
+        address.save()
 
         self.assertEqual(
             address.on_change_with_google_maps_url(),