diff --git a/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
index 5f9aa9ed46a..83a30d870bb 100644
--- a/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
+++ b/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
@@ -739,19 +739,34 @@ Test_SPI_SETDRAGFULLWINDOWS(void)
 void
 Test_SPI_SETNONCLIENTMETRICS(void)
 {
+    NONCLIENTMETRICSW metrics;
 
+    metrics.cbSize = sizeof(NONCLIENTMETRICSW);
+    TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(NONCLIENTMETRICSW), &metrics, 0) == 1);
+    TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(NONCLIENTMETRICSW) + 1, &metrics, 0) == 0);
+    TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(NONCLIENTMETRICSW), (PVOID)0xdeadbeef, 0) == 0);
 }
 
 void
 Test_SPI_SETMINIMIZEDMETRICS(void)
 {
+    MINIMIZEDMETRICS metrics;
 
+    metrics.cbSize = sizeof(MINIMIZEDMETRICS);
+    TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)&metrics, 0) == 1);
+    TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(MINIMIZEDMETRICS) + 1, (PVOID)&metrics, 0) == 0);
+    TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)0xdeadbeef, 0) == 0);
 }
 
 void
 Test_SPI_SETICONMETRICS(void)
 {
+    ICONMETRICS metrics;
 
+    metrics.cbSize = sizeof(ICONMETRICS);
+    TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS), (PVOID)&metrics, 0) == 1);
+    TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS) + 1, (PVOID)&metrics, 0) == 0);
+    TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS), (PVOID)0xdeadbeef, 0) == 0);
 }
 
 void