diff --git a/.clang-format-ignore b/.clang-format-ignore
index 2da894d..fded314 100644
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -41,6 +41,7 @@ tests/mocks/zephyr/include/zephyr/sys/time_units.h
 tests/mocks/zephyr/include/zephyr/sys/util.h
 tests/mocks/zephyr/include/zephyr/sys/util_macro.h
 tests/mocks/zephyr/include/zephyr/sys_clock.h
+tests/mocks/zephyr/include/version.h
 tests/mocks/zephyr/src/device.c
 tests/mocks/zephyr/src/flash.c
 tests/mocks/zephyr/src/flash_img.c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a26b838..bd9e13b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,5 +42,9 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/platform/net/${CONFIG_MENDER_MCU_C
 include_directories(${CMAKE_CURRENT_LIST_DIR}/platform/rtos/${CONFIG_MENDER_MCU_CLIENT_RTOS_TYPE}/include)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/platform/tls/${CONFIG_MENDER_MCU_CLIENT_TLS_TYPE}/include)
 
+# Define version
+file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/VERSION" MENDER_CLIENT_VERSION)
+add_definitions("-DMENDER_CLIENT_VERSION=\"${MENDER_CLIENT_VERSION}\"")
+
 # Creation of the library
 add_library(mender-mcu-client STATIC ${SOURCES_TEMP})
diff --git a/tests/mocks/esp-idf/CMakeLists.txt b/tests/mocks/esp-idf/CMakeLists.txt
index 4225171..41f7000 100755
--- a/tests/mocks/esp-idf/CMakeLists.txt
+++ b/tests/mocks/esp-idf/CMakeLists.txt
@@ -29,3 +29,6 @@ target_sources(${APP_EXECUTABLE_NAME} PRIVATE ${SOURCES_TEMP})
 
 # Add include directories
 include_directories("${CMAKE_CURRENT_LIST_DIR}/include")
+
+# Define esp-idf version
+add_definitions("-DIDF_VER=\"x.y.z\"")
diff --git a/tests/mocks/zephyr/include/version.h b/tests/mocks/zephyr/include/version.h
new file mode 100644
index 0000000..5e425db
--- /dev/null
+++ b/tests/mocks/zephyr/include/version.h
@@ -0,0 +1,6 @@
+#ifndef __VERSION_H__
+#define __VERSION_H__
+
+#define KERNEL_VERSION_STRING "x.y.z"
+
+#endif /* __VERSION_H__ */
diff --git a/tests/mocks/zephyr/include/zephyr/net/socket.h b/tests/mocks/zephyr/include/zephyr/net/socket.h
index 5eda195..6d919c4 100644
--- a/tests/mocks/zephyr/include/zephyr/net/socket.h
+++ b/tests/mocks/zephyr/include/zephyr/net/socket.h
@@ -7,6 +7,7 @@
 #define SOL_TLS          282
 #define TLS_SEC_TAG_LIST 1
 #define TLS_HOSTNAME     2
+#define TLS_PEER_VERIFY  5
 
 struct addrinfo {
     int              ai_family;