diff --git a/SetFlags.cmake b/SetFlags.cmake
index f8335cd25..d3a6aba86 100644
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -288,6 +288,7 @@ macro(set_exe_flags)
 			if ("${CLANG_VERSION}" VERSION_GREATER 3.5)
 				add_flags_cxx("-Wno-error=disabled-macro-expansion")
 			endif()
+			add_flags_cxx("-Wno-error=unused-command-line-argument")
 		endif()
 	endif()
 
diff --git a/lib/cmake-coverage b/lib/cmake-coverage
index fde8c1ef1..25af3c657 160000
--- a/lib/cmake-coverage
+++ b/lib/cmake-coverage
@@ -1 +1 @@
-Subproject commit fde8c1ef14684d763e7728dda98d49f2330534d1
+Subproject commit 25af3c657e42543e3e8b43378ebc5381e6260daa
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4db898fdb..bdab4bc58 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required (VERSION 2.6)
 
 enable_testing()
 
+if (CMAKE_BUILD_TYPE STREQUAL "COVERAGE")
+	setup_target_for_coverage("${PROJECT_NAME}_coverage" "ctest" coverage)
+endif()
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(ChunkData)