diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index 4e9e8f4c61d..4c2b612af1e 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -902,7 +902,14 @@ function(qtc_copy_to_builddir custom_target_name)
 endfunction()
 
 function(qtc_add_resources target resourceName)
-  cmake_parse_arguments(rcc "" "PREFIX;LANG;BASE" "FILES;OPTIONS" ${ARGN})
+  cmake_parse_arguments(rcc "" "PREFIX;LANG;BASE" "FILES;OPTIONS;CONDITION" ${ARGN})
+  if (${_arg_UNPARSED_ARGUMENTS})
+    message(FATAL_ERROR "qtc_add_resources had unparsed arguments!")
+  endif()
+
+  if (DEFINED _arg_CONDITION AND NOT _arg_CONDITION)
+    return()
+  endif()
 
   string(REPLACE "/" "_" resourceName ${resourceName})
   string(REPLACE "." "_" resourceName ${resourceName})
diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt
index 245b1c19db0..55d74241c1d 100644
--- a/src/plugins/projectexplorer/CMakeLists.txt
+++ b/src/plugins/projectexplorer/CMakeLists.txt
@@ -215,9 +215,10 @@ extend_qtc_plugin(ProjectExplorer
     jsonwizard/jsonwizard_test.cpp
     outputparser_test.cpp outputparser_test.h
 )
-if (WITH_TESTS)
-  file(GLOB_RECURSE test_resources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} testdata/*)
-  qtc_add_resources(ProjectExplorer "testdata"
+
+file(GLOB_RECURSE test_resources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} testdata/*)
+qtc_add_resources(ProjectExplorer "testdata"
+    CONDITION WITH_TESTS
     PREFIX "/projectexplorer"
     BASE "."
     FILES ${test_resources}