diff --git a/test/others/rpc/Makefile b/test/others/rpc/Makefile
index 176d522bb..1607779c4 100644
--- a/test/others/rpc/Makefile
+++ b/test/others/rpc/Makefile
@@ -12,6 +12,8 @@ run: all
 	chmod a+rwx build
 	chmod a+rwx build/{imgs_errno,imgs_ps,imgs_c,imgs_loop,imgs_py}
 	rm -f build/status
+	rm -f build/pidfile
+	rm -f build/criu_service.socket
 	rm -f build/_marker_*
 	@# Create all log files to be accessible for anybody
 	@# so that they can be displayed by any user.
diff --git a/test/others/rpc/run.sh b/test/others/rpc/run.sh
index e10f6a343..2243c21d4 100755
--- a/test/others/rpc/run.sh
+++ b/test/others/rpc/run.sh
@@ -75,8 +75,8 @@ function test_ps {
 
 function test_ps_addr {
 	title_print "Run page server address test"
-	# Reuse the dump images from test_c — the page server in
-	# lazy-pages mode needs pstree.img and inventory.img.
+	# Reuse dump images from test_c (page server needs pstree.img
+	# and inventory.img).
 	setsid ./test-ps-addr build/criu_service.socket build/imgs_c < /dev/null &>> build/output_ps_addr
 }