diff --git a/nominatim.py b/nominatim.py
index 23b23d7..882a34c 100644
--- a/nominatim.py
+++ b/nominatim.py
@@ -39,6 +39,9 @@ def drop_extra_detail_blocking_nominatim(value):
     # US, Wichita, 7700 East Kellogg Drive
     # works
     value = re.sub(r'(,|, |)unit .*', '', value, flags=re.IGNORECASE)
+
+    # Shop 3, 60 Bold Street
+    value = re.sub(r'Shop [^,]*,\s*', '', value, flags=re.IGNORECASE)
     return value
 
 
diff --git a/test_nominatim.py b/test_nominatim.py
new file mode 100644
index 0000000..d3818c9
--- /dev/null
+++ b/test_nominatim.py
@@ -0,0 +1,10 @@
+import unittest
+import nominatim
+
+
+class NominatimTests(unittest.TestCase):
+    def test_drop_shop_mention_from_street_address(self):
+        self.assertEqual(nominatim.drop_extra_detail_blocking_nominatim('Shop 3, 60 Bold Street'), '60 Bold Street')
+
+    def test_avoid_destroying_legit_street_name(self):
+        self.assertEqual(nominatim.drop_extra_detail_blocking_nominatim('60 Shopping Street'), '60 Shopping Street')