diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt
index 453acd4825bc..078090b46d86 100644
--- a/polly/CMakeLists.txt
+++ b/polly/CMakeLists.txt
@@ -162,10 +162,12 @@ add_custom_command( OUTPUT formatting COMMAND
   CLANG_FORMAT=${LLVM_BINARY_DIR}/bin/clang-format
   ${CMAKE_CURRENT_SOURCE_DIR}/utils/check_format.sh ${files})
 add_custom_target(polly-check-format DEPENDS formatting)
+set_target_properties(polly-check-format PROPERTIES FOLDER "Polly")
 add_custom_command( OUTPUT formatting-update COMMAND
   CLANG_FORMAT=${LLVM_BINARY_DIR}/bin/clang-format
   ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_format.sh ${files})
 add_custom_target(polly-update-format DEPENDS formatting-update)
+set_target_properties(polly-update-format PROPERTIES FOLDER "Polly")
 
 # Set the variable POLLY_LINK_LIBS in the llvm/tools/ dir.
 set(POLLY_LINK_LIBS ${POLLY_LINK_LIBS} PARENT_SCOPE)
diff --git a/polly/cmake/polly_macros.cmake b/polly/cmake/polly_macros.cmake
index f2e6a187f16b..50235d6774c2 100644
--- a/polly/cmake/polly_macros.cmake
+++ b/polly/cmake/polly_macros.cmake
@@ -18,6 +18,8 @@ macro(add_polly_library name)
     set(libkind)
   endif()
   add_library( ${name} ${libkind} ${srcs} )
+  set_target_properties(${name} PROPERTIES FOLDER "Polly")
+
   if( LLVM_COMMON_DEPENDS )
     add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
   endif( LLVM_COMMON_DEPENDS )
@@ -54,6 +56,7 @@ macro(add_polly_loadable_module name)
   endif()
   set(MODULE TRUE)
   add_polly_library(${name} ${srcs})
+  set_target_properties(${name} PROPERTIES FOLDER "Polly")
   if (GLOBAL_NOT_MODULE)
     unset (MODULE)
   endif()
diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt
index 5194c6e24367..3dfa7dd7ade1 100644
--- a/polly/lib/CMakeLists.txt
+++ b/polly/lib/CMakeLists.txt
@@ -322,6 +322,7 @@ endif()
 if (MSVC)
   # Add dummy target, because loadable modules are not supported on Windows
   add_custom_target(LLVMPolly)
+  set_target_properties(LLVMPolly PROPERTIES FOLDER "Polly")
 else ()
   add_polly_loadable_module(LLVMPolly
     Polly.cpp
diff --git a/polly/test/CMakeLists.txt b/polly/test/CMakeLists.txt
index 4075f0aab7e7..9eb32abb580f 100644
--- a/polly/test/CMakeLists.txt
+++ b/polly/test/CMakeLists.txt
@@ -46,6 +46,7 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR)
                     ${CMAKE_CURRENT_BINARY_DIR}/${testdir}
                     DEPENDS ${POLLY_TEST_DEPS}
                     COMMENT "Running Polly regression tests in ${testdir}")
+      set_target_properties(polly-test-${testdir} PROPERTIES FOLDER "Polly")
     endforeach()
 
     add_custom_target(check-polly
@@ -56,6 +57,7 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR)
                   ${CMAKE_CURRENT_BINARY_DIR}
                   DEPENDS ${POLLY_TEST_DEPS}
                   COMMENT "Running Polly regression tests")
+    set_target_properties(check-polly PROPERTIES FOLDER "Polly")
   endif()
 
 else (NOT DEFINED LLVM_MAIN_SRC_DIR)
@@ -74,7 +76,7 @@ else (NOT DEFINED LLVM_MAIN_SRC_DIR)
     DEPENDS ${POLLY_TEST_DEPS}
     )
 
-  set_target_properties(check-polly PROPERTIES FOLDER "polly tests")
+  set_target_properties(check-polly PROPERTIES FOLDER "Polly")
 
 endif (NOT DEFINED LLVM_MAIN_SRC_DIR)
 
@@ -84,4 +86,5 @@ configure_file(
 
 # Add a legacy target spelling: polly-test
 add_custom_target(polly-test)
+set_target_properties(polly-test PROPERTIES FOLDER "Polly")
 add_dependencies(polly-test check-polly)