diff --git a/test/mesh/Makefile b/test/mesh/Makefile
index d50b42148..450835c2c 100644
--- a/test/mesh/Makefile
+++ b/test/mesh/Makefile
@@ -53,7 +53,7 @@ LDFLAGS += $(shell pkg-config libusb-1.0 --libs)
 LDFLAGS += -lCppUTest -lCppUTestExt
 
 
-mesh: mesh.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} pb_adv.o pb_gatt.o mesh_foundation.o mesh_provisioning_service_server.o mesh_crypto.o provisioning_device.o mesh_network.o mesh_peer.o mesh_lower_transport.o mesh_transport.o mesh_virtual_addresses.o  mesh_keys.o mesh_access.o mesh_configuration_server.o mesh.o
+mesh: mesh.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} pb_adv.o pb_gatt.o mesh_foundation.o mesh_provisioning_service_server.o mesh_crypto.o provisioning_device.o mesh_network.o mesh_peer.o mesh_lower_transport.o mesh_transport.o mesh_virtual_addresses.o  mesh_keys.o mesh_access.o mesh_configuration_server.o mesh_generic_server.o mesh.o
 	${CC} $(filter-out mesh.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
 
 provisioner: ${CORE_OBJ} ${COMMON_OBJ} ${SM_OBJ} pb_adv.o mesh_crypto.o provisioning_provisioner.o provisioner.o
diff --git a/test/mesh/mesh.c b/test/mesh/mesh.c
index f2965dae7..b291358d6 100644
--- a/test/mesh/mesh.c
+++ b/test/mesh/mesh.c
@@ -54,6 +54,7 @@
 #include "mesh_transport.h"
 #include "mesh_foundation.h"
 #include "mesh_configuration_server.h"
+#include "mesh_generic_server.h"
 #include "mesh_access.h"
 #include "mesh_virtual_addresses.h"
 #include "mesh.h"
@@ -1033,7 +1034,10 @@ void proxy_configuration_message_handler(mesh_network_callback_type_t callback_t
 static mesh_model_t                 mesh_configuration_server_model;
 static mesh_model_t                 mesh_health_server_model;
 static mesh_model_t                 mesh_vendor_model;
+
 static mesh_model_t                 mesh_generic_on_off_server_model;
+static mesh_generic_on_off_state_t  mesh_generic_on_off_state;
+
 
 int btstack_main(void);
 int btstack_main(void)
@@ -1112,7 +1116,9 @@ int btstack_main(void)
 
     mesh_generic_on_off_server_model.model_identifier = mesh_model_get_model_identifier_bluetooth_sig(MESH_SIG_MODEL_ID_GENERIC_ON_OFF_SERVER);
     mesh_model_reset_appkeys(&mesh_generic_on_off_server_model);
+    mesh_generic_on_off_server_model.operations = mesh_generic_on_off_server_get_operations();    
     mesh_element_add_model(mesh_primary_element(), &mesh_generic_on_off_server_model);
+    mesh_generic_on_off_server_model.model_data = (void *) &mesh_generic_on_off_state;
 
     mesh_vendor_model.model_identifier = mesh_model_get_model_identifier(BLUETOOTH_COMPANY_ID_BLUEKITCHEN_GMBH, MESH_BLUEKITCHEN_MODEL_ID_TEST_SERVER);
     mesh_model_reset_appkeys(&mesh_vendor_model);
diff --git a/test/mesh/mesh_generic_server.c b/test/mesh/mesh_generic_server.c
new file mode 100644
index 000000000..0375512c5
--- /dev/null
+++ b/test/mesh/mesh_generic_server.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2019 BlueKitchen GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ * 4. Any redistribution, use, or modification is done solely for
+ *    personal benefit and not for any commercial purpose or for
+ *    monetary gain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS
+ * RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Please inquire about commercial licensing options at 
+ * contact@bluekitchen-gmbh.com
+ *
+ */
+
+#define __BTSTACK_FILE__ "mesh_generic_server.c"
+
+#include <string.h>
+#include <stdio.h>
+#include "mesh_generic_server.h"
+#include "btstack_util.h"
+#include "ble/mesh/mesh_network.h"
+#include "mesh_keys.h"
+#include "mesh_transport.h"
+#include "mesh_access.h"
+#include "mesh_foundation.h"
+#include "bluetooth_company_id.h"
+#include "btstack_memory.h"
+#include "btstack_debug.h"
+
+
+static void generic_server_send_message(mesh_model_t *mesh_model, uint16_t netkey_index, uint16_t dest, mesh_pdu_t *pdu){
+    if (mesh_model == NULL){
+        log_error("mesh_model == NULL"); 
+    }
+    if (mesh_model->element == NULL){
+        log_error("mesh_model->element == NULL"); 
+    }
+    uint16_t src  = mesh_model->element->unicast_address;
+    uint16_t appkey_index = MESH_DEVICE_KEY_INDEX;
+    uint8_t  ttl  = mesh_foundation_default_ttl_get();
+    mesh_upper_transport_setup_access_pdu_header(pdu, netkey_index, appkey_index, ttl, src, dest, 0);
+    mesh_upper_transport_send_access_pdu(pdu);
+}
+
+// Generic On Off State
+const mesh_access_message_t mesh_generic_on_off_status = {
+        MESH_GENERIC_ON_OFF_STATUS, "111"
+};
+
+static void mesh_generic_on_off_status_message(mesh_model_t *generic_on_off_server_model, uint16_t netkey_index, uint16_t dest){
+    if (generic_on_off_server_model == NULL){
+        log_error("generic_on_off_server_model ==  NULL");
+    }
+    mesh_generic_on_off_state_t * state = (mesh_generic_on_off_state_t *) generic_on_off_server_model->model_data;
+    if (state == NULL){
+        log_error("generic_on_off_status ==  NULL");
+    }
+    // setup message
+    mesh_transport_pdu_t * transport_pdu = NULL; 
+
+    if (state->remaining_time != 0) {
+        transport_pdu = mesh_access_setup_segmented_message(&mesh_generic_on_off_status, state->current_on_off_value, 
+            state->target_on_off_value, state->remaining_time);
+    } else {
+        transport_pdu = mesh_access_setup_segmented_message(&mesh_generic_on_off_status, state->current_on_off_value);
+    }
+    if (!transport_pdu) return;
+
+    // send as segmented access pdu
+    generic_server_send_message(generic_on_off_server_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
+}
+
+static void generic_on_off_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
+    mesh_generic_on_off_status_message(mesh_model, mesh_pdu_netkey_index(pdu), mesh_pdu_src(pdu));
+    mesh_access_message_processed(pdu);
+}
+
+// static void generic_on_off_set_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
+// }
+// static void generic_on_off_set_unacknowledged_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
+// }
+
+// Generic On Off Message
+const static mesh_operation_t mesh_generic_on_off_model_operations[] = {
+    { MESH_GENERIC_ON_OFF_GET,                                   0, generic_on_off_get_handler },
+    // { MESH_GENERIC_ON_OFF_SET,                                   4, generic_on_off_set_handler },
+    // { MESH_GENERIC_ON_OFF_SET_UNACKNOWLEDGED,                    4, generic_on_off_set_unacknowledged_handler },
+    { 0, 0, NULL }
+};
+
+const mesh_operation_t * mesh_generic_on_off_server_get_operations(void){
+    return mesh_generic_on_off_model_operations;
+}
diff --git a/test/mesh/mesh_generic_server.h b/test/mesh/mesh_generic_server.h
new file mode 100644
index 000000000..3054be999
--- /dev/null
+++ b/test/mesh/mesh_generic_server.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2019 BlueKitchen GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ * 4. Any redistribution, use, or modification is done solely for
+ *    personal benefit and not for any commercial purpose or for
+ *    monetary gain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS
+ * RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Please inquire about commercial licensing options at 
+ * contact@bluekitchen-gmbh.com
+ *
+ */
+
+#ifndef __MESH_GENERIC_SERVER_H
+#define __MESH_GENERIC_SERVER_H
+
+#include <stdint.h>
+#include "mesh_access.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define MESH_GENERIC_ON_OFF_GET                     0x8201u    
+#define MESH_GENERIC_ON_OFF_SET                     0x8202u
+#define MESH_GENERIC_ON_OFF_SET_UNACKNOWLEDGED      0x8203u
+#define MESH_GENERIC_ON_OFF_STATUS                  0x8204u
+
+typedef struct {
+    uint8_t current_on_off_value;
+
+    // transition data
+    uint8_t target_on_off_value;
+    uint8_t remaining_time;
+} mesh_generic_on_off_state_t;
+
+const mesh_operation_t * mesh_generic_on_off_server_get_operations(void);
+
+#ifdef __cplusplus
+} /* end of extern "C" */
+#endif
+
+#endif