diff --git a/search/search_quality/search_quality_tests/real_mwm_tests.cpp b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
index f0680ddf0a..c236416615 100644
--- a/search/search_quality/search_quality_tests/real_mwm_tests.cpp
+++ b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
@@ -1263,8 +1263,8 @@ UNIT_CLASS_TEST(MwmTestsFixture, PostOffice_Viewport)
     TEST_GREATER(results.size(), kPopularPoiResultsCount, ());
     Range allRange(results, true /* all */);
 
-    /// @todo office are near the "Poststrasse". Remove after fixing _near the street_ penalty.
-    EqualClassifType(allRange, GetClassifTypes({{"amenity", "post_office"}, {"office"}}));
+    /// @todo townhall and office are near the "Poststrasse". Remove after fixing _near the street_ penalty.
+    EqualClassifType(allRange, GetClassifTypes({{"amenity", "post_office"}, {"amenity", "townhall"}, {"office"}}));
   }
 }