diff --git a/pkgs/uvms/uvms.py b/pkgs/uvms/uvms.py
index 4833752..b7443b4 100644
--- a/pkgs/uvms/uvms.py
+++ b/pkgs/uvms/uvms.py
@@ -464,7 +464,7 @@ def connect_ch_vsock(
     s.setblocking(blocking)
     s.connect(vsock_sock_path)
 
-    with removing(vsock_sock_path):
+    with closing(s):
         s.send(b"CONNECT %d\n" % port)
         yield s
 
@@ -662,6 +662,7 @@ def main(args, args_next, cleanup, ps):
 
     assert ready
 
+    cleanup.enter_context(removing(ps.prefix + "/vsock.sock"))
     with connect_ch_vsock(ps.prefix + "/vsock.sock", 24601) as guest:
         for r in args.run:
             res = {}