diff --git a/unit-tests/CMakeLists.txt b/unit-tests/CMakeLists.txt
index dde7712..8ecfbd9 100644
--- a/unit-tests/CMakeLists.txt
+++ b/unit-tests/CMakeLists.txt
@@ -16,6 +16,10 @@ if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
+if (NOT DEFINED ENV{BOLOS_SDK})
+  message(FATAL_ERROR "BOLOS_SDK is not defined. ")
+endif()
+
 include(CTest)
 ENABLE_TESTING()
 
@@ -63,11 +67,13 @@ add_compile_definitions(
   BAGL_HEIGHT=64)
 
 include_directories(../src)
-include_directories(/opt/nanos-secure-sdk/include)
-include_directories(/opt/nanos-secure-sdk/lib_cxng/include)
-include_directories(/opt/nanos-secure-sdk/lib_ux/include)
-include_directories(/opt/nanos-secure-sdk/lib_bagl/include)
-include_directories(/opt/nanos-secure-sdk/lib_stusb/include)
+include_directories($ENV{BOLOS_SDK}/include)
+include_directories($ENV{BOLOS_SDK}/target/nanos/include)
+include_directories($ENV{BOLOS_SDK}/lib_cxng/include)
+include_directories($ENV{BOLOS_SDK}/lib_ux/include)
+include_directories($ENV{BOLOS_SDK}/lib_bagl/include)
+include_directories($ENV{BOLOS_SDK}/lib_stusb/include)
+include_directories(.)
 
 add_executable(test_format common/test_format.c)
 add_executable(test_asn1 common/test_asn1.c)
@@ -162,4 +168,4 @@ add_test(test_decoder_authority_type test_decoder_authority_type)
 add_test(test_decoder_optional_authority_type test_decoder_optional_authority_type)
 add_test(test_decoder_public_key test_decoder_public_key)
 add_test(test_get_operation_parser test_get_operation_parser)
-add_test(test_decoder_beneficiaries_extensions test_decoder_beneficiaries_extensions)
\ No newline at end of file
+add_test(test_decoder_beneficiaries_extensions test_decoder_beneficiaries_extensions)
diff --git a/unit-tests/glyphs.h b/unit-tests/glyphs.h
new file mode 100644
index 0000000..f5813ea
--- /dev/null
+++ b/unit-tests/glyphs.h
@@ -0,0 +1 @@
+// Stub to ensure compilation
\ No newline at end of file