diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e4d510ce0..28c22c546c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,6 +81,9 @@ include(CheckAndAddFlag)
 include(CheckCCompilerFlag)
 include(DolphinCompileDefinitions)
 
+# Enable folders for IDE
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 # Libraries to link
 set(LIBS)
 
diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt
index d2e7344332..1a7c5223b0 100644
--- a/Source/UnitTests/CMakeLists.txt
+++ b/Source/UnitTests/CMakeLists.txt
@@ -13,7 +13,10 @@ macro(add_dolphin_test target srcs)
 	# Host_ functions.
 	set(srcs2 ${srcs} ${CMAKE_SOURCE_DIR}/Source/UnitTests/TestUtils/StubHost.cpp)
 	add_executable(Test_${target} EXCLUDE_FROM_ALL ${srcs2})
-	set_target_properties(Test_${target} PROPERTIES OUTPUT_NAME Tests/${target})
+	set_target_properties(Test_${target} PROPERTIES
+		OUTPUT_NAME Tests/${target}
+		FOLDER Tests
+	)
 	target_link_libraries(Test_${target} ${LIBS})
 	add_dependencies(unittests Test_${target})
 	add_test(NAME ${target} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests/${target})