diff --git a/ros2topic/test/qos_subscription.py b/ros2topic/test/qos_subscription.py
index d295b2d99..aed7df0ca 100644
--- a/ros2topic/test/qos_subscription.py
+++ b/ros2topic/test/qos_subscription.py
@@ -55,7 +55,7 @@ def main(args=None):
             lambda msg: counter.onMsg('transient', msg),
             QoSProfile(
                 depth=10,
-                durability=QoSDurabilityPolicy.RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL))
+                durability=QoSDurabilityPolicy.TRANSIENT_LOCAL))
 
     sub_volatile = node.create_subscription(
             String,
@@ -63,7 +63,7 @@ def main(args=None):
             lambda msg: counter.onMsg('volatile', msg),
             QoSProfile(
                 depth=10,
-                durability=QoSDurabilityPolicy.RMW_QOS_POLICY_DURABILITY_VOLATILE))
+                durability=QoSDurabilityPolicy.VOLATILE))
 
     sub_reliable = node.create_subscription(
             String,
@@ -71,7 +71,7 @@ def main(args=None):
             lambda msg: counter.onMsg('reliable', msg),
             QoSProfile(
                 depth=10,
-                reliability=QoSReliabilityPolicy.RMW_QOS_POLICY_RELIABILITY_RELIABLE))
+                reliability=QoSReliabilityPolicy.RELIABLE))
 
     sub_best_effort = node.create_subscription(
             String,
@@ -79,7 +79,7 @@ def main(args=None):
             lambda msg: counter.onMsg('best_effort', msg),
             QoSProfile(
                 depth=10,
-                reliability=QoSReliabilityPolicy.RMW_QOS_POLICY_RELIABILITY_BEST_EFFORT))
+                reliability=QoSReliabilityPolicy.BEST_EFFORT))
 
     # Asserts to suppress unused variable warnings.
     assert sub_default
diff --git a/ros2topic/test/test_cli.py b/ros2topic/test/test_cli.py
index 0173ff91c..54a371a35 100644
--- a/ros2topic/test/test_cli.py
+++ b/ros2topic/test/test_cli.py
@@ -295,11 +295,11 @@ def test_topic_endpoint_info_verbose(self):
                 re.compile(r'Endpoint type: (INVALID|PUBLISHER|SUBSCRIPTION)'),
                 re.compile(r'GID: [\w\.]+'),
                 'QoS profile:',
-                re.compile(r'  Reliability: RMW_QOS_POLICY_RELIABILITY_\w+'),
-                re.compile(r'  Durability: RMW_QOS_POLICY_DURABILITY_\w+'),
+                re.compile(r'  Reliability: (RELIABLE|BEST_EFFORT|SYSTEM_DEFAULT|UNKNOWN)'),
+                re.compile(r'  Durability: (VOLATILE|TRANSIENT_LOCAL|SYSTEM_DEFAULT|UNKNOWN)'),
                 re.compile(r'  Lifespan: \d+ nanoseconds'),
                 re.compile(r'  Deadline: \d+ nanoseconds'),
-                re.compile(r'  Liveliness: RMW_QOS_POLICY_LIVELINESS_\w+'),
+                re.compile(r'  Liveliness: (AUTOMATIC|MANUAL_BY_TOPIC|SYSTEM_DEFAULT|UNKNOWN)'),
                 re.compile(r'  Liveliness lease duration: \d+ nanoseconds'),
                 '',
                 'Subscription count: 0',