diff --git a/routing/routing_integration_tests/route_test.cpp b/routing/routing_integration_tests/route_test.cpp
index 26febf521e..7cc5dfe742 100644
--- a/routing/routing_integration_tests/route_test.cpp
+++ b/routing/routing_integration_tests/route_test.cpp
@@ -967,4 +967,20 @@ UNIT_TEST(Israel_Jerusalem_Palestine_NoBorderPenalty)
                                    FromLatLon(31.7776832, 35.2236876), 76133);
 }
 
+// https://github.com/organicmaps/organicmaps/issues/6510
+UNIT_TEST(EqualMaxSpeeds_PreferPrimary_NotResidential)
+{
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
+                                   FromLatLon(46.5239, 5.6187), {0., 0.},
+                                   FromLatLon(46.5240, 5.6096), 1123);
+}
+
+// https://github.com/organicmaps/organicmaps/issues/3033#issuecomment-1798343531
+UNIT_TEST(Spain_NoMaxSpeeds_KeepTrunk_NotTrunkLink)
+{
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
+                                   FromLatLon(43.3773971, -3.43177355), {0., 0.},
+                                   FromLatLon(43.3685773, -3.42580007), 1116.79);
+}
+
 } // namespace route_test
diff --git a/routing_common/car_model_coefs.hpp b/routing_common/car_model_coefs.hpp
index 18484f37bc..60aedd39fd 100644
--- a/routing_common/car_model_coefs.hpp
+++ b/routing_common/car_model_coefs.hpp
@@ -28,8 +28,8 @@ HighwayBasedFactors const kHighwayBasedFactors = {
     {HighwayType::HighwayUnclassified, InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)},
 
     // Tier 4:
-    {HighwayType::HighwayResidential, InOutCityFactor(0.75)},
-    {HighwayType::HighwayLivingStreet, InOutCityFactor(0.75)},
+    {HighwayType::HighwayResidential, InOutCityFactor(0.70)},
+    {HighwayType::HighwayLivingStreet, InOutCityFactor(0.70)},
 
     // The rest:
     // By VNG: Changed 0.3 -> 0.95 for Road and 0.3 -> 1.0 for Track.