diff --git a/conf/countries/worldwide.yaml b/conf/countries/worldwide.yaml
index 05eb50c..a29e5a3 100644
--- a/conf/countries/worldwide.yaml
+++ b/conf/countries/worldwide.yaml
@@ -1654,7 +1654,7 @@ PH:
     address_template: |
         {{{attention}}}
         {{{house}}}
-        {{{house_number}}} {{{road}}}, {{#first}} {{{suburb}}}, || {{{city_district}}}, || {{{neighbourhood}}}, {{/first}} {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{suburb}}} || {{{state_district}}} {{/first}}
+        {{{house_number}}} {{{road}}}, {{#first}}{{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}}{{/first}}, {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{suburb}}} || {{{state_district}}} {{/first}}
         {{{postcode}}} {{#first}} {{{municipality}}} {{{region}}} {{{state}}} {{/first}}
         {{{country}}}
 
diff --git a/testcases/countries/ph.yaml b/testcases/countries/ph.yaml
index 073b735..ee755e4 100644
--- a/testcases/countries/ph.yaml
+++ b/testcases/countries/ph.yaml
@@ -45,3 +45,21 @@ expected:  |
     1550 Metro Manila
     Philippines
 ---
+description: address - city_district instead of suburb
+components:
+    house_number: 121 
+    road: Epifanio Delos Santos Ave.
+    city: Mandaluyong
+    postcode: 1550
+    city_district: Wack-wack Greenhills
+    county: Fifth District
+    country: Philippines
+    country_code: PH
+    attention: Mr. Juan Maliksi
+    state: Metro Manila
+expected:  |
+    Mr. Juan Maliksi
+    121 Epifanio Delos Santos Ave., Wack-wack Greenhills, Mandaluyong
+    1550 Metro Manila
+    Philippines
+