diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05cffb3..ca815c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,10 @@ option(STATIC_LINUX_BINARY "Build static Linux binary" OFF)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
+if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.6.0") 
+	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT p2pool)
+endif()
+
 add_subdirectory(external/src/RandomX)
 set(LIBS randomx)
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3b2d06b..5bb02d7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,6 +8,10 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
+if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.6.0") 
+	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT p2pool_tests)
+endif()
+
 add_subdirectory(googletest)
 set(LIBS gtest)