diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt
index 8947340b89d..51f702eb7b9 100644
--- a/rostests/apitests/CMakeLists.txt
+++ b/rostests/apitests/CMakeLists.txt
@@ -37,4 +37,5 @@ add_subdirectory(winhttp)
 add_subdirectory(wininet)
 add_subdirectory(winprint)
 add_subdirectory(winspool)
+add_subdirectory(wlanapi)
 add_subdirectory(ws2_32)
diff --git a/rostests/apitests/wlanapi/CMakeLists.txt b/rostests/apitests/wlanapi/CMakeLists.txt
new file mode 100644
index 00000000000..81906f26cf2
--- /dev/null
+++ b/rostests/apitests/wlanapi/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(wlanapi_apitest wlanapi.c testlist.c)
+set_module_type(wlanapi_apitest win32cui)
+add_importlibs(wlanapi_apitest wlanapi msvcrt kernel32)
+add_cd_file(TARGET wlanapi_apitest DESTINATION reactos/bin FOR all)
diff --git a/rostests/winetests/wlanapi/testlist.c b/rostests/apitests/wlanapi/testlist.c
similarity index 54%
rename from rostests/winetests/wlanapi/testlist.c
rename to rostests/apitests/wlanapi/testlist.c
index b5ff645ba27..600ff7e06b6 100644
--- a/rostests/winetests/wlanapi/testlist.c
+++ b/rostests/apitests/wlanapi/testlist.c
@@ -1,10 +1,7 @@
-/* Automatically generated file; DO NOT EDIT!! */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#define __ROS_LONG64__
 
 #define STANDALONE
-#include "wine/test.h"
+#include <apitest.h>
 
 extern void func_wlanapi(void);
 
diff --git a/rostests/winetests/wlanapi/wlanapi.c b/rostests/apitests/wlanapi/wlanapi.c
similarity index 95%
rename from rostests/winetests/wlanapi/wlanapi.c
rename to rostests/apitests/wlanapi/wlanapi.c
index e2f268ef76c..3d8f1382f11 100644
--- a/rostests/winetests/wlanapi/wlanapi.c
+++ b/rostests/apitests/wlanapi/wlanapi.c
@@ -18,15 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <apitest.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "wlanapi.h"
-
-#include "wine/test.h"
+#include <wlanapi.h>
 
 static const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}};
 
@@ -43,20 +37,20 @@ static void WlanOpenHandle_test(void)
         skip("Skipping wlanapi tests, WlanSvc is not running\n");
         return;
     }
-    ok(ret == ERROR_SUCCESS, "WlanOpenHandle failed, error %d\n", ret);
+    ok(ret == ERROR_SUCCESS, "WlanOpenHandle failed, error %ld\n", ret);
     WlanCloseHandle(hClientHandle, NULL);
 
     /* invalid pdwNegotiatedVersion */
     ret = WlanOpenHandle(1, NULL, NULL, &hClientHandle);
-    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
 
     /* invalid hClientHandle */
     ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, NULL);
-    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
 
     /* invalid pReserved */
     ret = WlanOpenHandle(1, (PVOID) 1, &dwNegotiatedVersion, &hClientHandle);
-    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
 }
 
 static void WlanCloseHandle_test(void)
diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt
index 6f7b9addb7b..8ddf4208828 100644
--- a/rostests/winetests/CMakeLists.txt
+++ b/rostests/winetests/CMakeLists.txt
@@ -114,7 +114,6 @@ add_subdirectory(wininet)
 add_subdirectory(winmm)
 #add_subdirectory(winspool)
 add_subdirectory(wintrust)
-add_subdirectory(wlanapi)
 add_subdirectory(wldap32)
 add_subdirectory(wmiutils)
 add_subdirectory(ws2_32)
diff --git a/rostests/winetests/wlanapi/CMakeLists.txt b/rostests/winetests/wlanapi/CMakeLists.txt
deleted file mode 100644
index 573b4e3198b..00000000000
--- a/rostests/winetests/wlanapi/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-add_executable(wlanapi_winetest wlanapi.c testlist.c)
-set_module_type(wlanapi_winetest win32cui)
-add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32)
-add_cd_file(TARGET wlanapi_winetest DESTINATION reactos/bin FOR all)