diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f5c559e6..188678ca0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,12 +243,13 @@ IF (BUILD_CLAR)
 
 	INCLUDE_DIRECTORIES(${CLAR_PATH})
 	FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c)
-	SET(SRC_CLAR "${CLAR_PATH}/main.c" "${CLAR_PATH}/clar_helpers.c" "${CLAR_PATH}/clar/clar.c")
+	SET(SRC_CLAR "${CLAR_PATH}/main.c" "${CLAR_PATH}/clar_libgit2.c" "${CLAR_PATH}/clar/clar.c")
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-prototypes")
 
 	ADD_CUSTOM_COMMAND(
 		OUTPUT ${CLAR_PATH}/clar/clar.c
 		COMMAND git submodule update --init tests-clar/clar
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 	)
 
 	ADD_CUSTOM_COMMAND(
diff --git a/tests-clar/clar_helpers.c b/tests-clar/clar_libgit2.c
similarity index 100%
rename from tests-clar/clar_helpers.c
rename to tests-clar/clar_libgit2.c