diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd8e974e..6ef72fc8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.7.3] - 2024-05-28
+## [1.7.3] - 2024-05-29
 
 ### Fixed
 - Changed name of 'Generate BIP39' menus to 'Recover BIP39'
 - Changed Second Montgomery constant used for `cx_bn_gf2_n_mul()` to a more suitable value
 - Improve efficiency of `cx_bn_gf2_n_mul()` for Nano S
+- Change cmocka git repo from cryptomilk.org to GitLab
 
 ## [1.7.2] - 2024-05-06
 
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 30c2269c..fee8040a 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -98,7 +98,7 @@ find_package(cmocka QUIET)
 include(FetchContent)
 FetchContent_Declare(
     cmocka
-    GIT_REPOSITORY https://git.cryptomilk.org/projects/cmocka.git
+    GIT_REPOSITORY https://gitlab.com/cmocka/cmocka.git
     GIT_TAG        cmocka-1.1.7
     GIT_SHALLOW    1
 )
diff --git a/tests/unit/lib/bolos/cxlib.h b/tests/unit/lib/bolos/cxlib.h
index dcddecbe..7a944963 100644
--- a/tests/unit/lib/bolos/cxlib.h
+++ b/tests/unit/lib/bolos/cxlib.h
@@ -11,6 +11,7 @@
 // Defines
 //-----------------------------------------------------------------------------
 // Those defines can be found in the SDK, in cx_errors.h file:
+#ifndef CX_CHECK
 #define CX_CHECK(call)                                                         \
   do {                                                                         \
     error = call;                                                              \
@@ -18,6 +19,7 @@
       goto end;                                                                \
     }                                                                          \
   } while (0)
+#endif
 
 #define CX_CHECK_IGNORE_CARRY(call)                                            \
   do {                                                                         \