diff --git a/test/rpc/Makefile b/test/rpc/Makefile
index 61d1b3c38..28bf530ab 100644
--- a/test/rpc/Makefile
+++ b/test/rpc/Makefile
@@ -3,14 +3,14 @@ all: test-c rpc_pb2.py
 test-c: rpc.pb-c.o test.o
 	gcc $^ -o $@ -lprotobuf-c
 
-test.o: ../test.c
+test.o: test.c
 	gcc -c $< -I ./
 
-rpc_pb2.py: ${PROTODIR}/rpc.proto
-	protoc --proto_path=${PROTODIR} --python_out=. ${PROTODIR}/rpc.proto
+rpc_pb2.py: rpc.proto
+	protoc --proto_path=. --python_out=. rpc.proto
 
-rpc.pb-c.c: ${PROTODIR}/rpc.proto
-	protoc-c --proto_path=${PROTODIR} --c_out=. ${PROTODIR}/rpc.proto
+rpc.pb-c.c: rpc.proto
+	protoc-c --proto_path=. --c_out=. rpc.proto
 
 clean:
-	rm -rf build
+	rm -rf build rpc.pb-c.o test.o test-c rpc.pb-c.c rpc.pb-c.h rpc_pb2.py
diff --git a/test/rpc/rpc.proto b/test/rpc/rpc.proto
new file mode 120000
index 000000000..bc0b0dfec
--- /dev/null
+++ b/test/rpc/rpc.proto
@@ -0,0 +1 @@
+../../protobuf/rpc.proto
\ No newline at end of file
diff --git a/test/rpc/run.sh b/test/rpc/run.sh
index f13b040d0..7cc8c52a5 100755
--- a/test/rpc/run.sh
+++ b/test/rpc/run.sh
@@ -34,13 +34,13 @@ title_print "Build programs"
 make clean
 mkdir build
 cd build
-make -f ../Makefile || { echo "FAIL"; exit 1; }
+make -C ../ || { echo "FAIL"; exit 1; }
 
 title_print "Start service server"
-${CRIU} service -v4 -o service.log --address criu_service.socket -d --pidfile pidfile || { echo "FAIL"; exit 1; }
+${CRIU} service -v4 -o service.log --address criu_service.socket -d --pidfile `pwd`/pidfile || { echo "FAIL"; exit 1; }
 
 title_print "Run test-c"
-./test-c || _exit $?
+../test-c || _exit $?
 
 title_print "Run test-py"
 ../test.py || _exit $?
diff --git a/test/rpc/test.c b/test/rpc/test.c
index 44812042b..3f356fa7d 100644
--- a/test/rpc/test.c
+++ b/test/rpc/test.c
@@ -1,4 +1,5 @@
 #include "rpc.pb-c.h"
+#include <stdlib.h>
 #include <stdbool.h>
 #include <sys/socket.h>
 #include <sys/un.h>