diff --git a/tests/test_testgres_common.py b/tests/test_testgres_common.py
index 21fa00d..b71dc5a 100644
--- a/tests/test_testgres_common.py
+++ b/tests/test_testgres_common.py
@@ -883,10 +883,20 @@ def test_backup_wrong_xlog_method(self, node_svc: PostgresNodeService):
 
     def test_pg_ctl_wait_option(self, node_svc: PostgresNodeService):
         assert isinstance(node_svc, PostgresNodeService)
-        C_MAX_ATTEMPTS = 50
+        with __class__.helper__get_node(node_svc) as node:
+            self.impl__test_pg_ctl_wait_option(node_svc, node)
 
-        node = __class__.helper__get_node(node_svc)
+    def impl__test_pg_ctl_wait_option(
+        self,
+        node_svc: PostgresNodeService,
+        node: PostgresNode
+    ) -> None:
+        assert isinstance(node_svc, PostgresNodeService)
+        assert isinstance(node, PostgresNode)
         assert node.status() == NodeStatus.Uninitialized
+
+        C_MAX_ATTEMPTS = 50
+
         node.init()
         assert node.status() == NodeStatus.Stopped
         node.start(wait=False)
@@ -950,7 +960,6 @@ def test_pg_ctl_wait_option(self, node_svc: PostgresNodeService):
             raise Exception("Unexpected node status: {0}.".format(s1))
 
         logging.info("OK. Node is stopped.")
-        node.cleanup()
 
     def test_replicate(self, node_svc: PostgresNodeService):
         assert isinstance(node_svc, PostgresNodeService)
diff --git a/tests/test_testgres_local.py b/tests/test_testgres_local.py
index 53c9e0f..63e5f37 100644
--- a/tests/test_testgres_local.py
+++ b/tests/test_testgres_local.py
@@ -341,10 +341,10 @@ def test_simple_with_bin_dir(self):
             bin_dir = node.bin_dir
 
         app = NodeApp()
-        correct_bin_dir = app.make_simple(base_dir=node.base_dir, bin_dir=bin_dir)
-        correct_bin_dir.slow_start()
-        correct_bin_dir.safe_psql("SELECT 1;")
-        correct_bin_dir.stop()
+        with app.make_simple(base_dir=node.base_dir, bin_dir=bin_dir) as correct_bin_dir:
+            correct_bin_dir.slow_start()
+            correct_bin_dir.safe_psql("SELECT 1;")
+            correct_bin_dir.stop()
 
         while True:
             try: