diff --git a/rostests/apitests/user32/CMakeLists.txt b/rostests/apitests/user32/CMakeLists.txt
index d57524afd53..9b3f4acdbfd 100644
--- a/rostests/apitests/user32/CMakeLists.txt
+++ b/rostests/apitests/user32/CMakeLists.txt
@@ -14,6 +14,7 @@ list(APPEND SOURCE
     ScrollDC.c
     ScrollWindowEx.c
     SetCursorPos.c
+    SetActiveWindow.c
     WndProc.c
     testlist.c
     user32_apitest.rc)
diff --git a/rostests/apitests/user32/SetActiveWindow.c b/rostests/apitests/user32/SetActiveWindow.c
new file mode 100644
index 00000000000..1f8aae2740e
--- /dev/null
+++ b/rostests/apitests/user32/SetActiveWindow.c
@@ -0,0 +1,52 @@
+/*
+ * PROJECT:         ReactOS api tests
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * PURPOSE:         Test for SetActiveWindow
+ * PROGRAMMERS:     Giannis Adamopoulos
+ */
+
+#include <stdio.h>
+#include <wine/test.h>
+#include <windows.h>
+
+void Test_SetActiveWindow()
+{
+    MSG msg;
+    HWND hWnd, hWnd1, hWnd2;
+
+    hWnd = CreateWindowW(L"BUTTON", L"ownertest", WS_OVERLAPPEDWINDOW,
+                        20, 20, 300, 300, NULL, NULL, 0, NULL);
+
+    hWnd1 = CreateWindowW(L"BUTTON", L"ownertest", WS_OVERLAPPEDWINDOW,
+                         20, 350, 300, 300, hWnd, NULL, 0, NULL);
+
+    hWnd2 = CreateWindowW(L"BUTTON", L"ownertest", WS_OVERLAPPEDWINDOW,
+                         200, 200, 300, 300, NULL, NULL, 0, NULL);
+
+    ShowWindow(hWnd, SW_SHOW);
+    UpdateWindow(hWnd);
+    ShowWindow(hWnd1, SW_SHOW);
+    UpdateWindow(hWnd1);
+    ShowWindow(hWnd2, SW_SHOW);
+    UpdateWindow(hWnd2);
+
+    while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg );
+
+    ok(GetWindow(hWnd2,GW_HWNDNEXT) == hWnd1, "Expected %p after %p, not %p\n",hWnd1,hWnd2,GetWindow(hWnd2,GW_HWNDNEXT) );
+    ok(GetWindow(hWnd1,GW_HWNDNEXT) == hWnd, "Expected %p after %p, not %p\n",hWnd,hWnd1,GetWindow(hWnd1,GW_HWNDNEXT));
+    ok(GetActiveWindow() == hWnd2, "Expected %p to be the active window, not %p\n",hWnd2,GetActiveWindow());
+
+    SetActiveWindow(hWnd);
+
+    while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg );
+
+    /* note: the owned is moved on top of the three windows */   
+    ok(GetActiveWindow() == hWnd, "Expected %p to be the active window, not %p\n",hWnd,GetActiveWindow());
+    ok(GetWindow(hWnd1,GW_HWNDNEXT) == hWnd, "Expected %p after %p, not %p\n",hWnd,hWnd1,GetWindow(hWnd1,GW_HWNDNEXT) );
+    ok(GetWindow(hWnd,GW_HWNDNEXT) == hWnd2, "Expected %p after %p, not %p\n",hWnd2,hWnd,GetWindow(hWnd,GW_HWNDNEXT) );
+}
+
+START_TEST(SetActiveWindow)
+{
+    Test_SetActiveWindow();
+}
diff --git a/rostests/apitests/user32/testlist.c b/rostests/apitests/user32/testlist.c
index fe27138d10b..51c4fce8244 100644
--- a/rostests/apitests/user32/testlist.c
+++ b/rostests/apitests/user32/testlist.c
@@ -15,6 +15,7 @@ extern void func_GetPeekMessage(void);
 extern void func_DeferWindowPos(void);
 extern void func_GetKeyState(void);
 extern void func_SetCursorPos(void);
+extern void func_SetActiveWindow(void);
 extern void func_WndProc(void);
 
 const struct test winetest_testlist[] =
@@ -29,6 +30,7 @@ const struct test winetest_testlist[] =
     { "DeferWindowPos", func_DeferWindowPos },
     { "GetKeyState", func_GetKeyState },
     { "SetCursorPos", func_SetCursorPos },
+    { "SetActiveWindow", func_SetActiveWindow },
     { "WndProc", func_WndProc },
     { 0, 0 }
 };
diff --git a/rostests/apitests/user32/user32_apitest.rbuild b/rostests/apitests/user32/user32_apitest.rbuild
index fdd83b50d76..cae3019caa8 100644
--- a/rostests/apitests/user32/user32_apitest.rbuild
+++ b/rostests/apitests/user32/user32_apitest.rbuild
@@ -19,6 +19,7 @@
 	<file>GetIconInfo.c</file>
 	<file>GetPeekMessage.c</file>
 	<file>DeferWindowPos.c</file>
+	<file>SetActiveWindow.c</file>
 	<file>SetCursorPos.c</file>
 	<file>WndProc.c</file>