diff --git a/generator/road_access_generator.cpp b/generator/road_access_generator.cpp
index 2540cded4a..ff37b4117a 100644
--- a/generator/road_access_generator.cpp
+++ b/generator/road_access_generator.cpp
@@ -110,10 +110,6 @@ TagMapping const kBicycleBarriersTagMapping = {
 // Empty mapping leads to default RoadAccess::Type::Yes access type for all roads.
 TagMapping const kTransitTagMapping = {};
 
-TagMapping const kForbiddenRoadsTagMapping = {
-    {OsmElement::Tag("highway", "ford"), RoadAccess::Type::No}
-};
-
 TagMapping const kDefaultTagMapping = {
     {OsmElement::Tag("access", "yes"), RoadAccess::Type::Yes},
     {OsmElement::Tag("access", "permissive"), RoadAccess::Type::Yes},
@@ -260,7 +256,6 @@ RoadAccessTagProcessor::RoadAccessTagProcessor(VehicleType vehicleType)
   switch (vehicleType)
   {
   case VehicleType::Car:
-    m_accessMappings.push_back(&kForbiddenRoadsTagMapping);
     m_accessMappings.push_back(&kMotorCarTagMapping);
     m_accessMappings.push_back(&kMotorVehicleTagMapping);
     m_accessMappings.push_back(&kVehicleTagMapping);
@@ -269,12 +264,10 @@ RoadAccessTagProcessor::RoadAccessTagProcessor(VehicleType vehicleType)
     m_hwIgnoreBarriersWithoutAccess = kHighwaysWhereIgnoreBarriersWithoutAccess;
     break;
   case VehicleType::Pedestrian:
-    m_accessMappings.push_back(&kForbiddenRoadsTagMapping);
     m_accessMappings.push_back(&kPedestrianTagMapping);
     m_accessMappings.push_back(&kDefaultTagMapping);
     break;
   case VehicleType::Bicycle:
-    m_accessMappings.push_back(&kForbiddenRoadsTagMapping);
     m_accessMappings.push_back(&kBicycleTagMapping);
     m_accessMappings.push_back(&kVehicleTagMapping);
     m_accessMappings.push_back(&kDefaultTagMapping);
diff --git a/routing/routing_quality/routing_quality_tests/barriers_tests.cpp b/routing/routing_quality/routing_quality_tests/barriers_tests.cpp
index 660030e2f0..ee7ffd5fe4 100644
--- a/routing/routing_quality/routing_quality_tests/barriers_tests.cpp
+++ b/routing/routing_quality/routing_quality_tests/barriers_tests.cpp
@@ -4,37 +4,38 @@
 
 using namespace routing_quality;
 
-// TODO: Uncomment after upcoming tiles seeding
 // There is a category of barriers through which no road must be built:
-// ice roads (highway = ice_road), fords (highway = ford) etc.
+// ice roads (highway = ice_road).
+// And there is a category of barriers through which the road should be built:
+// fords (highway = ford).
 // Tests on this kind of cases are grouped in this file.
 namespace
 {
-  //UNIT_TEST(RoutingQuality_NoRoute_Broad_Node_Jamaica)
-  //{
-  //  TEST(!CheckCarRoute({17.947273, -76.254299} /* start */, {17.944998, -76.254598} /* finish */,
-  //                     {{{17.9451506, -76.254426}}} /* reference point */),
-  //      ());
-  //}
+  UNIT_TEST(RoutingQuality_Broad_Node_Jamaica)
+  {
+    TEST(CheckCarRoute({17.94727, -76.25429} /* start */, {17.94499, -76.25459} /* finish */,
+                       {{{17.945150, -76.25442}}} /* reference point */),
+        ());
+  }
 
-  //UNIT_TEST(RoutingQuality_NoRoute_Broad_Way_Jamaica)
-  //{
-  //  TEST(!CheckCarRoute({18.102603, -76.983744} /* start */, {18.100315, -76.983744} /* finish */,
-  //                     {{{18.1007818, -76.9841238}}} /* reference point */),
-  //      ());
-  //}
+  UNIT_TEST(RoutingQuality_Broad_Way_Jamaica)
+  {
+    TEST(CheckCarRoute({18.10260, -76.98374} /* start */, {18.10031, -76.98374} /* finish */,
+                       {{{18.10078, -76.98412}}} /* reference point */),
+        ());
+  }
 
-  //UNIT_TEST(RoutingQuality_NoRoute_Broad_Node_Norway)
-  //{
-  //  TEST(!CheckCarRoute({56.985110, 9.770313} /* start */, {56.983581, 9.778153} /* finish */,
-  //                      {{{56.9854269, 9.7744898}}} /* reference point */),
-  //       ());
-  //}
+  UNIT_TEST(RoutingQuality_Broad_Node_Norway)
+  {
+    TEST(CheckCarRoute({56.98511, 9.77031} /* start */, {56.98358, 9.77815} /* finish */,
+                        {{{56.98542, 9.77448}}} /* reference point */),
+         ());
+  }
 
-  //UNIT_TEST(RoutingQuality_NoRoute_Broad_Node_Norway_2)
-  //{
-  //  TEST(!CheckCarRoute({56.202478, 8.775192} /* start */, {56.197321, 8.791904} /* finish */,
-  //                      {{{56.2017246, 8.7787964}}} /* reference point */),
-  //       ());
-  //}
+  UNIT_TEST(RoutingQuality_Broad_Node_Norway_2)
+  {
+    TEST(CheckCarRoute({56.20247, 8.77519} /* start */, {56.19732, 8.79190} /* finish */,
+                        {{{56.20172, 8.77879}}} /* reference point */),
+         ());
+  }
 }  // namespace