diff --git a/test/btstack-config.h b/test/btstack-config.h
index db160f2b8..a98cc3a9b 100644
--- a/test/btstack-config.h
+++ b/test/btstack-config.h
@@ -9,12 +9,12 @@
 
 #define ENABLE_LOG_INFO 
 #define ENABLE_LOG_ERROR
-#define HAVE_HCI_DUMP
-
+// #define HAVE_HCI_DUMP
+#define HAVE_SDP_EXTRA_QUERIES
+#define USE_POSIX_RUN_LOOP
 
 #define HCI_ACL_PAYLOAD_SIZE 52
 
-// 
 #define MAX_SPP_CONNECTIONS 1
 
 #define MAX_NO_HCI_CONNECTIONS MAX_SPP_CONNECTIONS
diff --git a/test/des_iterator/Makefile b/test/des_iterator/Makefile
index ec910e912..a2899f21a 100644
--- a/test/des_iterator/Makefile
+++ b/test/des_iterator/Makefile
@@ -4,7 +4,7 @@ CC = g++
 
 BTSTACK_ROOT =  ../..
 
-CFLAGS  = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include
+CFLAGS  = -g -Wall -I.. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include
 LDFLAGS += -lCppUTest -lCppUTestExt
 
 VPATH += ${BTSTACK_ROOT}/ble 
diff --git a/test/des_iterator/btstack-config.h b/test/des_iterator/btstack-config.h
deleted file mode 100644
index 584064ba8..000000000
--- a/test/des_iterator/btstack-config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// config.h created by configure for BTstack  Sun Sep 25 16:06:59 CEST 2011
-
-
-#ifndef __BTSTACK_CONFIG
-#define __BTSTACK_CONFIG
-
-#define HAVE_TRANSPORT_H4
-#define UART_DEVICE "/dev/tty.usbserial-A600eIDu"
-#define UART_SPEED 115200
-#define USE_POSIX_RUN_LOOP
-#define HAVE_TIME
-#define HAVE_MALLOC
-#define HAVE_BZERO
-#define ENABLE_LOG_INFO 
-#define ENABLE_LOG_ERROR
-#define HAVE_SDP_EXTRA_QUERIES
-#define SDP_DES_DUMP
-#define HCI_ACL_PAYLOAD_SIZE 1021
-// #define HCI_ACL_PAYLOAD_SIZE 52
-
-#endif
diff --git a/test/sdp_client/Makefile b/test/sdp_client/Makefile
index 1353b5525..c65f5db72 100644
--- a/test/sdp_client/Makefile
+++ b/test/sdp_client/Makefile
@@ -5,7 +5,7 @@ CC = g++
 BTSTACK_ROOT =  ../..
 CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
-CFLAGS  = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include
+CFLAGS  = -g -Wall -I.. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include -I${BTSTACK_ROOT}/ble
 LDFLAGS += -lCppUTest -lCppUTestExt
 # -L$(CPPUTEST_HOME) 
 
diff --git a/test/sdp_client/btstack-config.h b/test/sdp_client/btstack-config.h
deleted file mode 100644
index a61381417..000000000
--- a/test/sdp_client/btstack-config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// config.h created by configure for BTstack  Sun Sep 25 16:06:59 CEST 2011
-
-#ifndef __BTSTACK_CONFIG
-#define __BTSTACK_CONFIG
-
-#define HAVE_TRANSPORT_H4
-#define UART_DEVICE "/dev/tty.usbserial-A600eIDu"
-#define UART_SPEED 115200
-#define USE_POSIX_RUN_LOOP
-#define HAVE_TIME
-#define HAVE_MALLOC
-#define HAVE_BZERO
-// #define ENABLE_LOG_INFO 
-// #define ENABLE_LOG_ERROR
-#define HAVE_SDP_EXTRA_QUERIES
-#define SDP_DES_DUMP
-#define HCI_ACL_PAYLOAD_SIZE 1021
-// #define HCI_ACL_PAYLOAD_SIZE 52
-
-#endif
diff --git a/test/security_manager/Makefile b/test/security_manager/Makefile
index c01856400..a593b94c5 100644
--- a/test/security_manager/Makefile
+++ b/test/security_manager/Makefile
@@ -4,7 +4,7 @@ CC = g++
 
 BTSTACK_ROOT =  ../..
 
-CFLAGS  = -DUNIT_TEST -x c++ -g -Wall -Wno-unused -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include
+CFLAGS  = -DUNIT_TEST -x c++ -g -Wall -Wno-unused -I. -I.. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/ble -I${BTSTACK_ROOT}/include
 LDFLAGS +=  -lCppUTest -lCppUTestExt
 
 VPATH += ${BTSTACK_ROOT}/ble 
diff --git a/test/security_manager/btstack-config.h b/test/security_manager/btstack-config.h
deleted file mode 100644
index 3654bbaf6..000000000
--- a/test/security_manager/btstack-config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// config.h created by configure for BTstack  Tue Jun 4 23:10:20 CEST 2013
-
-#ifndef __BTSTACK_CONFIG
-#define __BTSTACK_CONFIG
-
-#define HAVE_TRANSPORT_USB
-#define HAVE_BLE
-#define USE_POSIX_RUN_LOOP
-#define HAVE_SDP
-#define HAVE_RFCOMM
-#define REMOTE_DEVICE_DB remote_device_db_iphone
-#define HAVE_SO_NOSIGPIPE
-#define HAVE_TIME
-#define HAVE_MALLOC
-#define HAVE_BZERO
-#define SDP_DES_DUMP
-#define ENABLE_LOG_INFO 
-#define ENABLE_LOG_ERROR
-#define HCI_ACL_PAYLOAD_SIZE 1021
-#define HAVE_HCI_DUMP
-#define SDP_DES_DUMP
-
-#endif