diff --git a/nav2_system_tests/CMakeLists.txt b/nav2_system_tests/CMakeLists.txt
index 70f2449cb4..45a8097b35 100644
--- a/nav2_system_tests/CMakeLists.txt
+++ b/nav2_system_tests/CMakeLists.txt
@@ -113,18 +113,19 @@ if(BUILD_TESTING)
 
   add_subdirectory(src/behavior_tree)
   add_subdirectory(src/planning)
-  add_subdirectory(src/localization)
-  add_subdirectory(src/system)
-  add_subdirectory(src/system_failure)
-  add_subdirectory(src/updown)
-  add_subdirectory(src/waypoint_follower)
-  add_subdirectory(src/gps_navigation)
-  add_subdirectory(src/behaviors/spin)
-  add_subdirectory(src/behaviors/wait)
-  add_subdirectory(src/behaviors/backup)
-  add_subdirectory(src/behaviors/drive_on_heading)
-  add_subdirectory(src/behaviors/assisted_teleop)
-  add_subdirectory(src/costmap_filters)
+  # Uncomment after https://github.com/ros-navigation/navigation2/pull/3634
+  # add_subdirectory(src/localization)
+  # add_subdirectory(src/system)
+  # add_subdirectory(src/system_failure)
+  # add_subdirectory(src/updown)
+  # add_subdirectory(src/waypoint_follower)
+  # add_subdirectory(src/gps_navigation)
+  # add_subdirectory(src/behaviors/spin)
+  # add_subdirectory(src/behaviors/wait)
+  # add_subdirectory(src/behaviors/backup)
+  # add_subdirectory(src/behaviors/drive_on_heading)
+  # add_subdirectory(src/behaviors/assisted_teleop)
+  # add_subdirectory(src/costmap_filters)
   add_subdirectory(src/error_codes)
   install(DIRECTORY maps DESTINATION share/${PROJECT_NAME})