diff --git a/test/gatt_server/Makefile b/test/gatt_server/Makefile
index 050fd4db3..23eb996b7 100644
--- a/test/gatt_server/Makefile
+++ b/test/gatt_server/Makefile
@@ -10,6 +10,7 @@ LDFLAGS +=  -lCppUTest -lCppUTestExt
 
 VPATH += ${BTSTACK_ROOT}/src
 VPATH += ${BTSTACK_ROOT}/src/ble 
+VPATH += ${BTSTACK_ROOT}/src/ble/gatt-service
 VPATH += ${BTSTACK_ROOT}/platform/posix
 
 COMMON = \
@@ -26,6 +27,14 @@ COMMON = \
 	le_device_db_memory.c       \
 	mock.c                      \
 	btstack_tlv.c               \
+	battery_service_server.c \
+	cycling_power_service_server.c \
+	cycling_speed_and_cadence_service_server.c \
+	device_information_service_server.c \
+	heart_rate_service_server.c \
+	hids_device.c \
+	nordic_spp_service_server.c \
+	ublox_spp_service_server.c \
 
 COMMON_OBJ = $(COMMON:.c=.o)
 
diff --git a/test/gatt_server/btstack_config.h b/test/gatt_server/btstack_config.h
index 55c02b86a..d70a1631e 100644
--- a/test/gatt_server/btstack_config.h
+++ b/test/gatt_server/btstack_config.h
@@ -25,6 +25,7 @@
 #define ENABLE_LE_CENTRAL
 #define ENABLE_SDP_EXTRA_QUERIES
 #define ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
+#define ENABLE_ATT_DELAYED_RESPONSE
 
 // BTstack configuration. buffers, sizes, ...
 #define HCI_ACL_PAYLOAD_SIZE 52
diff --git a/test/gatt_server/mock.c b/test/gatt_server/mock.c
index b1c94d7de..7cd705337 100644
--- a/test/gatt_server/mock.c
+++ b/test/gatt_server/mock.c
@@ -199,6 +199,9 @@ void hci_connections_get_iterator(btstack_linked_list_iterator_t *it){
 void l2cap_run(void){
 }
 
+void l2cap_register_packet_handler(void (*handler)(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size)){
+}
+
 int gap_authenticated(hci_con_handle_t con_handle){
 	return 0;
 }
@@ -214,3 +217,7 @@ int gap_secure_connection(hci_con_handle_t con_handle){
 gap_connection_type_t gap_get_connection_type(hci_con_handle_t connection_handle){
 	return GAP_CONNECTION_INVALID;
 }
+int gap_request_connection_parameter_update(hci_con_handle_t con_handle, uint16_t conn_interval_min,
+	uint16_t conn_interval_max, uint16_t conn_latency, uint16_t supervision_timeout){
+	return 0;	
+}