diff --git a/test/unit-tests/CMakeLists.txt b/test/unit-tests/CMakeLists.txt
index 097f2f6..2ecfa5c 100644
--- a/test/unit-tests/CMakeLists.txt
+++ b/test/unit-tests/CMakeLists.txt
@@ -28,6 +28,10 @@ target_link_libraries(unit-tests
     test-mocks
 )
 
-# add_custom_command(TARGET unit-tests POST_BUILD
-#     COMMAND ${unit-tests_BINARY_DIR}/unit-tests
-# )
+option(RUN_UNIT_TESTS_IN_POST_BUILD false)
+
+if (RUN_UNIT_TESTS_IN_POST_BUILD)
+    add_custom_command(TARGET unit-tests POST_BUILD
+        COMMAND ${unit-tests_BINARY_DIR}/unit-tests
+    )
+endif()