diff --git a/test/mesh/mesh_generic_level_server.h b/test/mesh/mesh_generic_level_server.h
index d07a08fb9..07c0ab224 100644
--- a/test/mesh/mesh_generic_level_server.h
+++ b/test/mesh/mesh_generic_level_server.h
@@ -46,21 +46,6 @@ extern "C"
 {
 #endif
 
-typedef struct {
-    mesh_transition_t base_transition;
-
-    int16_t current_value;
-    int16_t initial_value;
-    int16_t target_value;
-    int16_t stepwise_value_increment;
-    int16_t delta_from_initial_value;
-    int16_t transition_speed;
-} mesh_transition_int16_t;
-
-typedef struct {
-    mesh_transition_int16_t transition_data;       
-} mesh_generic_level_state_t;
-
 const mesh_operation_t * mesh_generic_level_server_get_operations(void);
 /**
  * @brief Register packet handler
diff --git a/test/mesh/mesh_generic_model.h b/test/mesh/mesh_generic_model.h
index 9f376c071..dda2023ed 100644
--- a/test/mesh/mesh_generic_model.h
+++ b/test/mesh/mesh_generic_model.h
@@ -64,10 +64,25 @@ typedef struct {
     uint8_t  target_value;
 } mesh_transition_bool_t;
 
+typedef struct {
+    mesh_transition_t base_transition;
+
+    int16_t current_value;
+    int16_t initial_value;
+    int16_t target_value;
+    int16_t stepwise_value_increment;
+    int16_t delta_from_initial_value;
+    int16_t transition_speed;
+} mesh_transition_int16_t;
+
 typedef struct {
     mesh_transition_bool_t transition_data;          
 } mesh_generic_on_off_state_t;
 
+typedef struct {
+    mesh_transition_int16_t transition_data;       
+} mesh_generic_level_state_t;
+
 #ifdef __cplusplus
 } /* end of extern "C" */
 #endif