diff --git a/test/others/rpc/Makefile b/test/others/rpc/Makefile
index 69537bb0d..b2f907abe 100644
--- a/test/others/rpc/Makefile
+++ b/test/others/rpc/Makefile
@@ -8,9 +8,17 @@ PYTHON ?= python3
 
 run: all
 	@make -C .. loop
-	mkdir -p build
+	mkdir -p build/{imgs_errno,imgs_ps,imgs_c,imgs_loop,imgs_py}
 	chmod a+rwx build
+	chmod a+rwx build/{imgs_errno,imgs_ps,imgs_c,imgs_loop,imgs_py}
 	rm -f build/status
+	@# Create all log files to be accessible for anybody
+	@# so that they can be displayed by any user.
+	for i in imgs_errno/criu.log imgs_ps/page-server.log imgs_ps/dump.log \
+		imgs_c/restore-c.log imgs_loop/criu.log imgs_loop/dump-loop.log \
+		imgs_py/criu.log imgs_py/restore-py.log imgs_c/criu.log service.log; do \
+		touch build/$$i; chmod 666 build/$$i; \
+	done
 	sudo -g '#1000' -u '#1000' mkfifo build/status
 	@# Need to start the criu daemon here to access the pidfile.
 	@# The script read.py is used to wait until 'criu service'
diff --git a/test/others/rpc/run.sh b/test/others/rpc/run.sh
index 3d5a53ae6..b6158dfea 100755
--- a/test/others/rpc/run.sh
+++ b/test/others/rpc/run.sh
@@ -3,6 +3,7 @@
 set -e
 
 CRIU=./criu
+FAIL=1
 
 export PROTODIR=`readlink -f "${PWD}/../../protobuf"`
 
@@ -19,6 +20,13 @@ function stop_server {
 	title_print "Shutdown service server"
 	kill -SIGTERM $(cat build/pidfile)
 	unlink build/pidfile
+	if [ "${FAIL}" == "1" ]; then
+		for i in build/output*; do
+			echo "File: $i"
+			cat $i
+		done
+		find . -name "*.log" -print -exec cat {} \; || true
+	fi
 }
 
 function test_c {
@@ -80,6 +88,8 @@ test_restore_loop
 test_ps
 test_errno
 
+FAIL=0
+
 stop_server
 
 trap 'echo "Success"' EXIT