diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt
index d0949562a5..2c1a1346a4 100644
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -150,5 +150,65 @@ install(FILES ${lib_hdrs}
 # Test files processing is in the separated directory to avoid 'Src' source 
 # filter creation in Visual Studio 
 if(BUILD_TESTS AND NOT ANDROID AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
-	add_subdirectory(test)
+    set(the_target "opencv_test_${name}")   
+    
+    include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"
+                        "${CMAKE_CURRENT_SOURCE_DIR}/test"
+                        "${CMAKE_CURRENT_BINARY_DIR}")                      
+    
+    set(test_deps opencv_${name} opencv_ts opencv_highgui opencv_calib3d ${DEPS})
+    foreach(d ${test_deps})
+        if(${d} MATCHES "opencv_")
+            if(${d} MATCHES "opencv_lapack")
+            else()
+                string(REPLACE "opencv_" "${CMAKE_CURRENT_SOURCE_DIR}/../" d_dir ${d})
+                include_directories("${d_dir}/include")
+            endif()
+        endif()
+    endforeach()
+    
+    file(GLOB test_srcs "test/*.cpp")
+    file(GLOB test_hdrs "test/*.h*")
+    
+    if(HAVE_CUDA)
+            include_directories(${CUDA_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia/core ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia/NPP_staging)
+    
+            file(GLOB nvidia "test/nvidia/*.*")
+            SET(ncv_cpp ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia/core/NCV.cpp)
+            source_group("nvidia" FILES ${nvidia})
+    endif()
+    
+    
+    add_executable(${the_target} ${test_srcs} ${test_hdrs} ${nvidia} ${ncv_cpp})
+    
+    if(PCHSupport_FOUND)
+        set(pch_header ${CMAKE_CURRENT_SOURCE_DIR}/test/test_precomp.hpp)
+        if(${CMAKE_GENERATOR} MATCHES "Visual*" OR ${CMAKE_GENERATOR} MATCHES "Xcode*")
+            if(${CMAKE_GENERATOR} MATCHES "Visual*")
+                set(${the_target}_pch "test/test_precomp.cpp")
+            endif()            
+            add_native_precompiled_header(${the_target} ${pch_header})
+        elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
+            add_precompiled_header(${the_target} ${pch_header})
+        endif()
+    endif()
+    
+    # Additional target properties
+    set_target_properties(${the_target} PROPERTIES
+        DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+        )
+    
+    add_dependencies(${the_target} ${test_deps})
+    
+    # Add the required libraries for linking:
+    target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${test_deps})
+    
+    enable_testing()
+    get_target_property(LOC ${the_target} LOCATION)
+    add_test(${the_target} "${LOC}")
+    
+    if(WIN32)
+        install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
+    endif()
 endif()
\ No newline at end of file
diff --git a/modules/gpu/test/CMakeLists.txt b/modules/gpu/test/CMakeLists.txt
deleted file mode 100644
index d631d86884..0000000000
--- a/modules/gpu/test/CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-set(the_target "opencv_test_${name}")	
-project(${the_target})
-
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include"
-                    "${CMAKE_CURRENT_SOURCE_DIR}/.."
-                    "${CMAKE_CURRENT_BINARY_DIR}")						
-
-set(test_deps opencv_${name} opencv_ts opencv_highgui opencv_calib3d ${DEPS})
-foreach(d ${test_deps})
-    if(${d} MATCHES "opencv_")
-        if(${d} MATCHES "opencv_lapack")
-        else()
-            string(REPLACE "opencv_" "${CMAKE_CURRENT_SOURCE_DIR}/../../" d_dir ${d})
-            include_directories("${d_dir}/include")
-        endif()
-    endif()
-endforeach()
-
-file(GLOB test_srcs "*.cpp")
-file(GLOB test_hdrs "*.h*")
-
-if(HAVE_CUDA)
-        include_directories(${CUDA_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia/core ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia/NPP_staging)
-
-        file(GLOB nvidia "nvidia/*.*")
-        SET(ncv_cpp ${CMAKE_SOURCE_DIR}/modules/gpu/src/nvidia/core/NCV.cpp)
-        source_group("nvidia" FILES ${nvidia})
-endif()
-
-
-add_executable(${the_target} ${test_srcs} ${test_hdrs} ${nvidia} ${ncv_cpp})
-
-#if(PCHSupport_FOUND)
-#    set(pch_header ${CMAKE_CURRENT_SOURCE_DIR}/test_precomp.hpp)
-#    if(${CMAKE_GENERATOR} MATCHES "Visual*" OR ${CMAKE_GENERATOR} MATCHES "Xcode*")
-#        if(${CMAKE_GENERATOR} MATCHES "Visual*")
-#            set(${the_target}_pch "test_precomp.cpp")
-#        endif()            
-#        add_native_precompiled_header(${the_target} ${pch_header})
-#    elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
-#        add_precompiled_header(${the_target} ${pch_header})
-#    endif()
-#endif()
-
-# Additional target properties
-set_target_properties(${the_target} PROPERTIES
-    DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
-    )
-
-add_dependencies(${the_target} ${test_deps})
-
-# Add the required libraries for linking:
-target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${test_deps})
-
-enable_testing()
-get_target_property(LOC ${the_target} LOCATION)
-add_test(${the_target} "${LOC}")
-
-if(WIN32)
-    install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
-endif()