diff --git a/ros2param/test/test_verb_dump.py b/ros2param/test/test_verb_dump.py
index 6af3b4e07..7e45cb2dd 100644
--- a/ros2param/test/test_verb_dump.py
+++ b/ros2param/test/test_verb_dump.py
@@ -82,6 +82,7 @@
 
 @pytest.mark.rostest
 @launch_testing.parametrize('rmw_implementation', get_available_rmw_implementations())
+@pytest.mark.xfail(reason='Flaky on Galactic: https://github.com/ros2/ros2cli/issues/630')
 def generate_test_description(rmw_implementation):
     path_to_fixtures = os.path.join(os.path.dirname(__file__), 'fixtures')
     additional_env = {'RMW_IMPLEMENTATION': rmw_implementation}
@@ -116,8 +117,6 @@ def generate_test_description(rmw_implementation):
     ])
 
 
-# Flaky on Galactic: https://github.com/ros2/ros2cli/issues/630
-@pytest.mark.xfail
 class TestVerbDump(unittest.TestCase):
 
     @classmethod
diff --git a/ros2param/test/test_verb_list.py b/ros2param/test/test_verb_list.py
index 48af5ec59..d82148ec0 100644
--- a/ros2param/test/test_verb_list.py
+++ b/ros2param/test/test_verb_list.py
@@ -51,6 +51,7 @@
 
 @pytest.mark.rostest
 @launch_testing.parametrize('rmw_implementation', get_available_rmw_implementations())
+@pytest.mark.xfail(reason='Flaky on Galactic: https://github.com/ros2/ros2cli/issues/630')
 def generate_test_description(rmw_implementation):
     path_to_fixtures = Path(__file__).parent / 'fixtures'
     additional_env = {'RMW_IMPLEMENTATION': rmw_implementation}
@@ -85,8 +86,6 @@ def generate_test_description(rmw_implementation):
     ])
 
 
-# Flaky on Galactic: https://github.com/ros2/ros2cli/issues/630
-@pytest.mark.xfail
 class TestVerbList(unittest.TestCase):
 
     @classmethod
diff --git a/ros2param/test/test_verb_load.py b/ros2param/test/test_verb_load.py
index 0a0b6e46d..4fab708b1 100644
--- a/ros2param/test/test_verb_load.py
+++ b/ros2param/test/test_verb_load.py
@@ -95,6 +95,7 @@
 
 @pytest.mark.rostest
 @launch_testing.parametrize('rmw_implementation', get_available_rmw_implementations())
+@pytest.mark.xfail(reason='Flaky on Galactic: https://github.com/ros2/ros2cli/issues/630')
 def generate_test_description(rmw_implementation):
     path_to_fixtures = os.path.join(os.path.dirname(__file__), 'fixtures')
     additional_env = {'RMW_IMPLEMENTATION': rmw_implementation}
@@ -129,8 +130,6 @@ def generate_test_description(rmw_implementation):
     ])
 
 
-# Flaky on Galactic: https://github.com/ros2/ros2cli/issues/630
-@pytest.mark.xfail
 class TestVerbDump(unittest.TestCase):
 
     @classmethod