diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0e266f..0acfa32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,12 @@ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
 include_directories(tests examples/linux .)
 
 add_executable(nanomodbus_tests nanomodbus.c tests/nanomodbus_tests.c)
+
 add_executable(server_disabled nanomodbus.c tests/server_disabled.c)
+target_compile_definitions(server_disabled PUBLIC NMBS_SERVER_DISABLED)
+
 add_executable(client_disabled nanomodbus.c tests/client_disabled.c)
+target_compile_definitions(client_disabled PUBLIC NMBS_CLIENT_DISABLED)
 
 add_executable(client-tcp nanomodbus.c examples/linux/client-tcp.c)
 add_executable(server-tcp nanomodbus.c examples/linux/server-tcp.c)
diff --git a/tests/client_disabled.c b/tests/client_disabled.c
index c9c83c0..10a2bd6 100644
--- a/tests/client_disabled.c
+++ b/tests/client_disabled.c
@@ -1,5 +1,3 @@
-#define NMBS_CLIENT_DISABLED
-
 #include "nanomodbus.h"
 
 #define UNUSED_PARAM(x) ((x) = (x))
@@ -32,7 +30,7 @@ int main() {
             .write = write_empty,
     };
 
-    nmbs_callbacks callbacks_empty;
+    nmbs_callbacks callbacks_empty = {0};
 
     nmbs_error err = nmbs_server_create(&nmbs, 1, &platform_conf_empty, &callbacks_empty);
     if (err != 0)
diff --git a/tests/server_disabled.c b/tests/server_disabled.c
index 4c77f29..633a655 100644
--- a/tests/server_disabled.c
+++ b/tests/server_disabled.c
@@ -1,5 +1,3 @@
-#define NMBS_SERVER_DISABLED
-
 #include "nanomodbus.h"
 
 #define UNUSED_PARAM(x) ((x) = (x))