diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index 39f2747d..ab0b6f56 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -1,9 +1,10 @@
 
 CFLAGS += -Wall -Werror -Wno-unused-function -g
 CFLAGS += -L ../../
-CFLAGS += -lcmocka -lunicorn
 CFLAGS += -I ../../include
 
+LIBS += -lcmocka -lunicorn
+
 ifeq ($(UNICORN_ASAN),yes)
 CC = clang -fsanitize=address -fno-omit-frame-pointer
 CXX = clang++ -fsanitize=address -fno-omit-frame-pointer
@@ -13,7 +14,7 @@ endif
 
 ALL_TESTS = test_sanity test_x86 test_mem_map test_mem_high test_mem_map_ptr \
 	test_tb_x86 test_multihook test_pc_change test_x86_soft_paging \
-        test_hookcounts test_hang test_x86_shl_enter_leave
+        test_hookcounts test_hang test_x86_shl_enter_leave test_x86_rip_bug
 
 .PHONY: all
 all: ${ALL_TESTS}
@@ -37,6 +38,7 @@ test: ${ALL_TESTS}
 	./test_hookcounts
 	./test_hang
 	./test_x86_shl_enter_leave
+	./test_x86_rip_bug
 
 test_sanity: test_sanity.c
 test_x86: test_x86.c
@@ -50,6 +52,7 @@ test_x86_soft_paging: test_x86_soft_paging.c
 test_hookcounts: test_hookcounts.c
 test_hang: test_hang.c
 test_x86_shl_enter_leave: test_x86_shl_enter_leave.c
+test_x86_rip_bug: test_x86_rip_bug.c
 
 ${ALL_TESTS}:
-	${CC} ${CFLAGS} -o $@ $^
+	${CC} ${CFLAGS} -o $@ $^ ${LIBS}