diff --git a/modules/rostests/win32/user32/CMakeLists.txt b/modules/rostests/win32/user32/CMakeLists.txt
index 205afbc4039..097f5261f59 100644
--- a/modules/rostests/win32/user32/CMakeLists.txt
+++ b/modules/rostests/win32/user32/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(biditext)
+add_subdirectory(messagebox)
 add_subdirectory(paintdesktop)
-add_subdirectory(softmodalmsgbox)
 add_subdirectory(sysicon)
 add_subdirectory(winstation)
diff --git a/modules/rostests/win32/user32/messagebox/CMakeLists.txt b/modules/rostests/win32/user32/messagebox/CMakeLists.txt
new file mode 100644
index 00000000000..a989b491dce
--- /dev/null
+++ b/modules/rostests/win32/user32/messagebox/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(messagebox messagebox.c messagebox.rc)
+set_module_type(messagebox win32cui UNICODE)
+add_importlibs(messagebox user32 msvcrt kernel32)
+add_rostests_file(TARGET messagebox SUBDIR suppl)
diff --git a/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.c b/modules/rostests/win32/user32/messagebox/messagebox.c
similarity index 100%
rename from modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.c
rename to modules/rostests/win32/user32/messagebox/messagebox.c
diff --git a/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.rc b/modules/rostests/win32/user32/messagebox/messagebox.rc
similarity index 100%
rename from modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.rc
rename to modules/rostests/win32/user32/messagebox/messagebox.rc
diff --git a/modules/rostests/win32/user32/softmodalmsgbox/resource.h b/modules/rostests/win32/user32/messagebox/resource.h
similarity index 100%
rename from modules/rostests/win32/user32/softmodalmsgbox/resource.h
rename to modules/rostests/win32/user32/messagebox/resource.h
diff --git a/modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt b/modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt
deleted file mode 100644
index 310a01e5189..00000000000
--- a/modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-add_executable(softmodalmsgbox softmodalmsgbox.c softmodalmsgbox.rc)
-set_module_type(softmodalmsgbox win32cui UNICODE)
-add_importlibs(softmodalmsgbox user32 msvcrt kernel32)
-add_rostests_file(TARGET softmodalmsgbox SUBDIR suppl)