diff --git a/test/security_manager/Makefile b/test/security_manager/Makefile
index d9a832ca3..c8bb91b7d 100644
--- a/test/security_manager/Makefile
+++ b/test/security_manager/Makefile
@@ -5,8 +5,8 @@ CC = g++
 BTSTACK_ROOT =  ../..
 CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -DUNIT_TEST -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include -I$(CPPUTEST_HOME)/include
-LDFLAGS += -L$(CPPUTEST_HOME) -lCppUTest -lCppUTestExt
+CFLAGS  = -DUNIT_TEST -x c++ -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include -I$(CPPUTEST_HOME)/include
+LDFLAGS += -L$(CPPUTEST_HOME)/lib -lCppUTest -lCppUTestExt
 
 COMMON = \
     ${BTSTACK_ROOT}/src/utils.c			            \
diff --git a/test/security_manager/mock.c b/test/security_manager/mock.c
index 6e98ad8a4..2b5fdc3c8 100644
--- a/test/security_manager/mock.c
+++ b/test/security_manager/mock.c
@@ -200,5 +200,9 @@ void hci_disconnect_security_block(hci_con_handle_t con_handle){
 	printf("hci_disconnect_security_block \n");	
 }
 
+int hci_non_flushable_packet_boundary_flag_supported(){
+	return 1;
+}
+
 void l2cap_run(void){
 }