diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt
index 19a0da766f5..18db2787417 100644
--- a/modules/rostests/apitests/CMakeLists.txt
+++ b/modules/rostests/apitests/CMakeLists.txt
@@ -64,7 +64,6 @@ add_subdirectory(utildll)
 add_subdirectory(uxtheme)
 add_subdirectory(version)
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
-    add_subdirectory(win32u)
     add_subdirectory(win32nt)
 endif()
 add_subdirectory(winhttp)
diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt
index 56568185694..8b6d2484ef9 100644
--- a/modules/rostests/apitests/win32nt/CMakeLists.txt
+++ b/modules/rostests/apitests/win32nt/CMakeLists.txt
@@ -1,4 +1,8 @@
 
+add_subdirectory(win32u_xpsp2)
+add_subdirectory(win32u_2k3sp2)
+add_subdirectory(win32u_vista)
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ../gditools)
 
diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32nt/win32u_2k3sp2/CMakeLists.txt
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt
rename to modules/rostests/apitests/win32nt/win32u_2k3sp2/CMakeLists.txt
diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/main.c b/modules/rostests/apitests/win32nt/win32u_2k3sp2/main.c
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_2k3sp2/main.c
rename to modules/rostests/apitests/win32nt/win32u_2k3sp2/main.c
diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/sys-stubs.S b/modules/rostests/apitests/win32nt/win32u_2k3sp2/sys-stubs.S
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_2k3sp2/sys-stubs.S
rename to modules/rostests/apitests/win32nt/win32u_2k3sp2/sys-stubs.S
diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2-64.h b/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2-64.h
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2-64.h
rename to modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2-64.h
diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2.h b/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2.h
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2.h
rename to modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2.h
diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec b/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32u_2k3sp2.spec
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec
rename to modules/rostests/apitests/win32nt/win32u_2k3sp2/win32u_2k3sp2.spec
diff --git a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32nt/win32u_vista/CMakeLists.txt
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt
rename to modules/rostests/apitests/win32nt/win32u_vista/CMakeLists.txt
diff --git a/modules/rostests/apitests/win32u/win32u_vista/main.c b/modules/rostests/apitests/win32nt/win32u_vista/main.c
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_vista/main.c
rename to modules/rostests/apitests/win32nt/win32u_vista/main.c
diff --git a/modules/rostests/apitests/win32u/win32u_vista/sys-stubs.S b/modules/rostests/apitests/win32nt/win32u_vista/sys-stubs.S
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_vista/sys-stubs.S
rename to modules/rostests/apitests/win32nt/win32u_vista/sys-stubs.S
diff --git a/modules/rostests/apitests/win32u/win32u_vista/w32ksvc32.h b/modules/rostests/apitests/win32nt/win32u_vista/w32ksvc32.h
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_vista/w32ksvc32.h
rename to modules/rostests/apitests/win32nt/win32u_vista/w32ksvc32.h
diff --git a/modules/rostests/apitests/win32u/win32u_vista/w32ksvc64.h b/modules/rostests/apitests/win32nt/win32u_vista/w32ksvc64.h
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_vista/w32ksvc64.h
rename to modules/rostests/apitests/win32nt/win32u_vista/w32ksvc64.h
diff --git a/modules/rostests/apitests/win32u/win32u_vista/win32u_vista.spec b/modules/rostests/apitests/win32nt/win32u_vista/win32u_vista.spec
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_vista/win32u_vista.spec
rename to modules/rostests/apitests/win32nt/win32u_vista/win32u_vista.spec
diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32nt/win32u_xpsp2/CMakeLists.txt
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt
rename to modules/rostests/apitests/win32nt/win32u_xpsp2/CMakeLists.txt
diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/main.c b/modules/rostests/apitests/win32nt/win32u_xpsp2/main.c
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_xpsp2/main.c
rename to modules/rostests/apitests/win32nt/win32u_xpsp2/main.c
diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/sys-stubs.S b/modules/rostests/apitests/win32nt/win32u_xpsp2/sys-stubs.S
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_xpsp2/sys-stubs.S
rename to modules/rostests/apitests/win32nt/win32u_xpsp2/sys-stubs.S
diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/win32ksvc-xp.h b/modules/rostests/apitests/win32nt/win32u_xpsp2/win32ksvc-xp.h
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_xpsp2/win32ksvc-xp.h
rename to modules/rostests/apitests/win32nt/win32u_xpsp2/win32ksvc-xp.h
diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec b/modules/rostests/apitests/win32nt/win32u_xpsp2/win32u_xpsp2.spec
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec
rename to modules/rostests/apitests/win32nt/win32u_xpsp2/win32u_xpsp2.spec
diff --git a/modules/rostests/apitests/win32u/CMakeLists.txt b/modules/rostests/apitests/win32u/CMakeLists.txt
deleted file mode 100644
index cbee7a23e19..00000000000
--- a/modules/rostests/apitests/win32u/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-add_subdirectory(win32u_xpsp2)
-add_subdirectory(win32u_2k3sp2)
-add_subdirectory(win32u_vista)