diff --git a/test/att_db/Makefile b/test/att_db/Makefile
index 9a61f5f26..b3516652f 100644
--- a/test/att_db/Makefile
+++ b/test/att_db/Makefile
@@ -1,12 +1,10 @@
 CC = g++
 
-# Requirements: http://www.cpputest.org/ should be placed in btstack/test
+# Requirements: cpputest.github.io
 
 BTSTACK_ROOT =  ../..
-CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -g -Wall -I.. -I${BTSTACK_ROOT}/example/libusb -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include -I$(CPPUTEST_HOME)/include
-# -L$(CPPUTEST_HOME)/lib
+CFLAGS  = -g -Wall -I.. -I${BTSTACK_ROOT}/example/libusb -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include 
 LDFLAGS += -lCppUTest -lCppUTestExt 
 
 VPATH += ${BTSTACK_ROOT}/ble 
@@ -24,7 +22,7 @@ all: att_db_util_test
 att_db_util_test: ${COMMON_OBJ} att_db_util_test.c
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
 
-test:
+test: all
 	./att_db_util_test
 
 clean:
diff --git a/test/ble_client/Makefile b/test/ble_client/Makefile
index c8172e056..a0b0e99b5 100644
--- a/test/ble_client/Makefile
+++ b/test/ble_client/Makefile
@@ -1,11 +1,10 @@
 CC = g++
 
-# Requirements: http://www.cpputest.org/ should be placed in btstack/test
+# Requirements: cpputest.github.io
 
 BTSTACK_ROOT =  ../..
-CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -g -Wall -I.. -I${BTSTACK_ROOT}/example/libusb -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include -I$(CPPUTEST_HOME)/include
+CFLAGS  = -g -Wall -I.. -I${BTSTACK_ROOT}/example/libusb -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include
 LDFLAGS += -L$(CPPUTEST_HOME)/lib -lCppUTest -lCppUTestExt
 
 VPATH += ${BTSTACK_ROOT}/ble 
@@ -33,7 +32,7 @@ all: ad_parser
 ad_parser: ${CORE_OBJ} ${COMMON_OBJ} advertising_data_parser.c
 	${CC} ${CORE_OBJ} ${COMMON_OBJ} advertising_data_parser.c ${CFLAGS} ${LDFLAGS} -o $@
 
-test:
+test: all
 	./ad_parser
 
 clean:
diff --git a/test/des_iterator/Makefile b/test/des_iterator/Makefile
index 34ff05635..ec910e912 100644
--- a/test/des_iterator/Makefile
+++ b/test/des_iterator/Makefile
@@ -1,13 +1,11 @@
 CC = g++
 
-# Requirements: http://www.cpputest.org/ should be placed in btstack/test
+# Requirements: cpputest.github.io
 
 BTSTACK_ROOT =  ../..
-CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include -I$(CPPUTEST_HOME)/include
+CFLAGS  = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include
 LDFLAGS += -lCppUTest -lCppUTestExt
-# -L$(CPPUTEST_HOME) 
 
 VPATH += ${BTSTACK_ROOT}/ble 
 VPATH += ${BTSTACK_ROOT}/src
@@ -24,7 +22,7 @@ all: des_iterator_test
 des_iterator_test: ${COMMON_OBJ} des_iterator_test.c
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
 
-test:
+test: all
 	./des_iterator_test
 
 clean:
diff --git a/test/gatt_client/Makefile b/test/gatt_client/Makefile
index 069f90783..d639a6e99 100644
--- a/test/gatt_client/Makefile
+++ b/test/gatt_client/Makefile
@@ -1,13 +1,11 @@
 CC = g++
 
-# Requirements: http://www.cpputest.org/ should be placed in btstack/test
+# Requirements: cpputest.github.io
 
 BTSTACK_ROOT =  ../..
-CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -DUNIT_TEST -x c++ -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include -I$(CPPUTEST_HOME)/include
+CFLAGS  = -DUNIT_TEST -x c++ -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include
 LDFLAGS +=  -lCppUTest -lCppUTestExt
-# -L$(CPPUTEST_HOME)
 
 VPATH += ${BTSTACK_ROOT}/ble 
 VPATH += ${BTSTACK_ROOT}/src
@@ -44,7 +42,7 @@ gatt_client_test: profile.h ${CORE_OBJ} ${COMMON_OBJ} gatt_client_test.o expecte
 le_central: ${CORE_OBJ} ${COMMON_OBJ} le_central.o
 	${CC} ${CORE_OBJ} ${COMMON_OBJ} le_central.o ${CFLAGS} ${LDFLAGS} -o $@
 
-test:
+test: all
 	./gatt_client_test
 	./le_central
 		
diff --git a/test/linked_list/Makefile b/test/linked_list/Makefile
index 0e08d07d4..0902c8c62 100644
--- a/test/linked_list/Makefile
+++ b/test/linked_list/Makefile
@@ -1,13 +1,12 @@
 CC=g++
 
-# Requirements: http://www.cpputest.org/ should be placed in btstack/test
+# Requirements: cpputest.github.io
 
 BTSTACK_ROOT =  ../..
 CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include -I$(CPPUTEST_HOME)/include
+CFLAGS  = -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include
 LDFLAGS += -lCppUTest -lCppUTestExt
-# -L$(CPPUTEST_HOME)/lib
 
 VPATH += ${BTSTACK_ROOT}/ble 
 VPATH += ${BTSTACK_ROOT}/src
@@ -23,7 +22,7 @@ all: linked_list_test
 linked_list_test: ${COMMON_OBJ} linked_list_test.c
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
 
-test:
+test: all
 	./linked_list_test
 	
 clean:
diff --git a/test/remote_device_db/Makefile b/test/remote_device_db/Makefile
index 347113c77..5e7f30eeb 100644
--- a/test/remote_device_db/Makefile
+++ b/test/remote_device_db/Makefile
@@ -1,13 +1,12 @@
 CC=g++
 
-# Requirements: http://www.cpputest.org/ should be placed in btstack/test
+# Requirements: cpputest.github.io
 
 BTSTACK_ROOT =  ../..
 CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include -I${BTSTACK_ROOT}/ble -I$(CPPUTEST_HOME)/include
+CFLAGS  = -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include -I${BTSTACK_ROOT}/ble
 LDFLAGS += -lCppUTest -lCppUTestExt
-# -L$(CPPUTEST_HOME) 
 
 VPATH += ${BTSTACK_ROOT}/ble 
 VPATH += ${BTSTACK_ROOT}/src
@@ -36,7 +35,7 @@ remote_device_db_memory_test: ${MEMORY_OBJ} remote_device_db_memory_test.c
 remote_device_db_fs_test: ${FS_OBJ} remote_device_db_fs_test.c
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
 
-test:
+test: all
 	./remote_device_db_memory_test
 	./remote_device_db_fs_test
 
diff --git a/test/sdp_client/Makefile b/test/sdp_client/Makefile
index 2d14ce98d..1353b5525 100644
--- a/test/sdp_client/Makefile
+++ b/test/sdp_client/Makefile
@@ -1,11 +1,11 @@
 CC = g++
 
-# Requirements: http://www.cpputest.org/ should be placed in btstack/test
+# Requirements: cpputest.github.io
 
 BTSTACK_ROOT =  ../..
 CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include -I$(CPPUTEST_HOME)/include
+CFLAGS  = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include
 LDFLAGS += -lCppUTest -lCppUTestExt
 # -L$(CPPUTEST_HOME) 
 
@@ -34,7 +34,7 @@ service_attribute_search_query: ${COMMON_OBJ} service_attribute_search_query.c
 service_search_query: ${COMMON_OBJ} service_search_query.c
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
 
-test:
+test: all
 	./sdp_rfcomm_query
 	./general_sdp_query
 	./service_attribute_search_query
diff --git a/test/security_manager/Makefile b/test/security_manager/Makefile
index e1b49b680..b8b4e7c8f 100644
--- a/test/security_manager/Makefile
+++ b/test/security_manager/Makefile
@@ -1,13 +1,11 @@
 CC = g++
 
-# Requirements: http://www.cpputest.org/ should be placed in btstack/test
+# Requirements: cpputest.github.io
 
 BTSTACK_ROOT =  ../..
-CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -DUNIT_TEST -x c++ -g -Wall -Wno-unused -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include -I$(CPPUTEST_HOME)/include
+CFLAGS  = -DUNIT_TEST -x c++ -g -Wall -Wno-unused -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include
 LDFLAGS +=  -lCppUTest -lCppUTestExt
-# -L$(CPPUTEST_HOME)/lib
 
 VPATH += ${BTSTACK_ROOT}/ble 
 VPATH += ${BTSTACK_ROOT}/src
@@ -39,7 +37,7 @@ security_manager: ${CORE_OBJ} ${COMMON_OBJ} security_manager.c
 aestest: aestest.c rijndael.c
 	${CC} ${CFLAGS} -m32 rijndael.c aestest.c -o $@
 
-test:
+test: all
 	./security_manager
 	./aestest