diff --git a/src/IhtaAddTest.cmake b/src/IhtaAddTest.cmake
index a988f78eb5cbec700cff99ae416f38488eabf09d..9284dc44567585b6171e8f476e55e5df38334797 100644
--- a/src/IhtaAddTest.cmake
+++ b/src/IhtaAddTest.cmake
@@ -28,8 +28,10 @@ macro (ihta_add_test)
 	set (multiValueArgs SOURCES COV_SOURCES)
 	cmake_parse_arguments (IHTA_ADD_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-	if (NOT DEFINED IHTA_ADD_TEST_NAME)
+	if (NOT DEFINED IHTA_ADD_TEST_NAME AND DEFINED IHTA_ADD_TEST_TEST_TARGET)
 		set (IHTA_ADD_TEST_NAME ${IHTA_ADD_TEST_TEST_TARGET}UnitTest)
+	elseif (NOT DEFINED IHTA_ADD_TEST_NAME AND NOT DEFINED IHTA_ADD_TEST_TEST_TARGET)
+		message (FATAL_ERROR "ihta_add_test requires the definition of either the NAME or the TEST_TARGET.")
 	endif ()
 
 	# Add required packages