diff --git a/tools/code_coverage_report.bash b/tools/code_coverage_report.bash
index 54569365b72c68e99c7eb19982ba33e044dfca52..d4ff3d7f5dc0f94f2b3b1b6996933c2c69b36ffd 100755
--- a/tools/code_coverage_report.bash
+++ b/tools/code_coverage_report.bash
@@ -71,6 +71,12 @@ lcov \
 lcov \
   --remove ${LCOVDIR}/workspace_coverage.info \
     "${PWD}/build/*" \
+  --remove ${LCOVDIR}/workspace_coverage.info \
+    "${PWD}/*/dwb_msgs/*" \
+  --remove ${LCOVDIR}/workspace_coverage.info \
+    "${PWD}/*/nav2_msgs/*" \
+  --remove ${LCOVDIR}/workspace_coverage.info \
+    "${PWD}/*/nav_2d_msgs/*" \
   --output-file ${LCOVDIR}/project_coverage.info \
   --rc lcov_branch_coverage=1
 
@@ -82,4 +88,4 @@ elif [ $COVERAGE_REPORT_VIEW = genhtml ]; then
   genhtml ${LCOVDIR}/project_coverage.info \
     --output-directory ${LCOVDIR}/html \
     --branch-coverage -p ${PWD}
-fi
\ No newline at end of file
+fi
diff --git a/tools/run_test_suite.bash b/tools/run_test_suite.bash
index b4e2c45a23631cbe8555e7e62893032d848f1057..51323c566abf01dad10cdae99de95efbf10bf51e 100755
--- a/tools/run_test_suite.bash
+++ b/tools/run_test_suite.bash
@@ -19,10 +19,10 @@ colcon test --packages-select nav2_system_tests --ctest-args --exclude-regex "te
 # that happened in any of the `colcon test` lines above.
 colcon test-result --verbose
 
-$SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_localization$
-$SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_planner_costmaps$
-$SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_planner_random$
-$SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_bt_navigator$
-$SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_bt_navigator_with_dijkstra$
+# $SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_localization$
+# $SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_planner_costmaps$
+# $SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_planner_random$
+# $SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_bt_navigator$
+# $SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_bt_navigator_with_dijkstra$
 $SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_dynamic_obstacle$
-$SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_multi_robot$
+# $SCRIPT_DIR/ctest_retry.bash -r 3 -d build/nav2_system_tests -t test_multi_robot$