diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt
index 53c87297d89..797e6e5ed1c 100644
--- a/modules/rostests/apitests/shell32/CMakeLists.txt
+++ b/modules/rostests/apitests/shell32/CMakeLists.txt
@@ -15,6 +15,7 @@ list(APPEND SOURCE
     DragDrop.cpp
     ExtractIconEx.cpp
     FindExecutable.cpp
+    GetDisplayNameOf.cpp
     IShellFolderViewCB.cpp
     OpenAs_RunDLL.cpp
     PathResolve.cpp
diff --git a/modules/rostests/apitests/shell32/GetDisplayNameOf.cpp b/modules/rostests/apitests/shell32/GetDisplayNameOf.cpp
new file mode 100644
index 00000000000..72765d9317a
--- /dev/null
+++ b/modules/rostests/apitests/shell32/GetDisplayNameOf.cpp
@@ -0,0 +1,40 @@
+/*
+ * PROJECT:         ReactOS API tests
+ * LICENSE:         LGPLv2.1+ - See COPYING.LIB in the top level directory
+ * PURPOSE:         Test for GetDisplayNameOf
+ * COPYRIGHT:       Copyright 2023 Mark Jansen <mark.jansen@reactos.org>
+ *                  Copyright 2023 Doug Lyons <douglyons@douglyons.com>
+ */
+
+#include "shelltest.h"
+#include <shellutils.h>
+
+START_TEST(GetDisplayNameOf)
+{
+    HRESULT hr;
+    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+
+    CComPtr<IShellFolder> spPanel;
+
+    hr = CoCreateInstance(CLSID_ControlPanel, NULL, CLSCTX_ALL,
+                          IID_PPV_ARG(IShellFolder, &spPanel));
+
+    ok_hr(hr, S_OK);
+    if (SUCCEEDED(hr))
+    {
+        /* We want to know if 'STRRET ret' data was changed when the first
+         * parameter of GetDisplayNameOf for the Control Panel is NULL */
+        STRRET ret, expected;
+        memset(&ret, 'a', sizeof(ret));
+        memset(&expected, 'a', sizeof(expected));
+        hr = spPanel->GetDisplayNameOf(NULL, SHGDN_NORMAL, &ret);
+        ok_hex(hr, S_FALSE);
+        ok(memcmp(&ret, &expected, sizeof(ret)) == 0, "Data was changed!\n");
+        memset(&ret, 'a', sizeof(ret));
+        memset(&expected, 'a', sizeof(expected));
+        hr = spPanel->GetDisplayNameOf(NULL, SHGDN_FORPARSING, &ret);
+        ok_hex(hr, S_FALSE);
+        ok(memcmp(&ret, &expected, sizeof(ret)) == 0, "Data was changed!\n");
+    }
+
+}
diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c
index 2c65335551f..5522cb0b659 100644
--- a/modules/rostests/apitests/shell32/testlist.c
+++ b/modules/rostests/apitests/shell32/testlist.c
@@ -16,6 +16,7 @@ extern void func_CUserNotification(void);
 extern void func_DragDrop(void);
 extern void func_ExtractIconEx(void);
 extern void func_FindExecutable(void);
+extern void func_GetDisplayNameOf(void);
 extern void func_IShellFolderViewCB(void);
 extern void func_menu(void);
 extern void func_OpenAs_RunDLL(void);
@@ -49,6 +50,7 @@ const struct test winetest_testlist[] =
     { "DragDrop", func_DragDrop },
     { "ExtractIconEx", func_ExtractIconEx },
     { "FindExecutable", func_FindExecutable },
+    { "GetDisplayNameOf", func_GetDisplayNameOf },
     { "IShellFolderViewCB", func_IShellFolderViewCB },
     { "menu", func_menu },
     { "OpenAs_RunDLL", func_OpenAs_RunDLL },