diff --git a/test_cli_remapping/test/name_maker.py b/test_cli_remapping/test/name_maker.py
index f7920185..f016fdd4 100644
--- a/test_cli_remapping/test/name_maker.py
+++ b/test_cli_remapping/test/name_maker.py
@@ -37,8 +37,9 @@ def __init__(self):
 
 if __name__ == '__main__':
     try:
-        with rclpy.init():
-            node = NameMaker()
-            rclpy.spin(node)
+        rclpy.init()
+        node = NameMaker()
+        rclpy.spin(node)
+        rclpy.shutdown()
     except (KeyboardInterrupt, ExternalShutdownException):
         print('Shutting down name_maker.py')