diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 8e523edd5ba..e7728ee151f 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -1108,8 +1108,8 @@ static const struct message WmShowPopupExtremeLocationSeq[] = {
     { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 },
     { HCBT_SETFOCUS, hook },
     { WM_SETFOCUS, sent|defwinproc },
-    { WM_NCPAINT, sent|wparam, 1 },
-    { WM_ERASEBKGND, sent },
+    { WM_NCPAINT, sent|wparam|optional, 1 }, /* Not always sent on Win8+ */
+    { WM_ERASEBKGND, sent|optional }, /* Not always sent on Win8+ */
     { WM_WINDOWPOSCHANGED, sent },
     /* occasionally received on test machines */
     { WM_NCPAINT, sent|optional },