diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake
index efe7efd9ce7..224ae4b2b14 100644
--- a/cmake/QtCreatorAPIInternal.cmake
+++ b/cmake/QtCreatorAPIInternal.cmake
@@ -464,7 +464,7 @@ function(extend_qtc_target target_name)
   cmake_parse_arguments(_arg
     ""
     "SOURCES_PREFIX;SOURCES_PREFIX_FROM_TARGET;FEATURE_INFO"
-    "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES"
+    "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES;SOURCES_PROPERTIES"
     ${ARGN}
   )
 
@@ -546,4 +546,8 @@ function(extend_qtc_target target_name)
   if (_arg_PROPERTIES)
     set_target_properties(${target_name} PROPERTIES ${_arg_PROPERTIES})
   endif()
+
+  if (_arg_SOURCES_PROPERTIES)
+    set_source_files_properties(${_arg_SOURCES} PROPERTIES ${_arg_SOURCES_PROPERTIES})
+  endif()
 endfunction()
diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt
index 58f8c73d1d6..d05509636ec 100644
--- a/src/plugins/projectexplorer/CMakeLists.txt
+++ b/src/plugins/projectexplorer/CMakeLists.txt
@@ -216,9 +216,14 @@ extend_qtc_plugin(ProjectExplorer
 extend_qtc_plugin(ProjectExplorer
   CONDITION WITH_TESTS
   SOURCES
-    jsonwizard/jsonwizard_test.cpp
     outputparser_test.cpp outputparser_test.h
 )
+extend_qtc_plugin(ProjectExplorer
+  CONDITION WITH_TESTS
+  SOURCES
+    jsonwizard/jsonwizard_test.cpp
+  SOURCES_PROPERTIES HEADER_FILE_ONLY ON
+)
 
 file(GLOB_RECURSE test_resources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} testdata/*)
 qtc_add_resources(ProjectExplorer "testdata"
@@ -227,11 +232,3 @@ qtc_add_resources(ProjectExplorer "testdata"
   BASE "."
   FILES ${test_resources}
 )
-
-qtc_plugin_enabled(_projectexplorer_enabled ProjectExplorer)
-if (WITH_TESTS AND _projectexplorer_enabled)
-  set_source_files_properties(jsonwizard/jsonwizard_test.cpp
-    PROPERTIES HEADER_FILE_ONLY ON
-  )
-endif()
-