diff --git a/src/libraries/Microsoft.Win32.SystemEvents/tests/SystemEvents.UserPreference.cs b/src/libraries/Microsoft.Win32.SystemEvents/tests/SystemEvents.UserPreference.cs
index ecb4693bc4aa80..4c229a23008a50 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/tests/SystemEvents.UserPreference.cs
+++ b/src/libraries/Microsoft.Win32.SystemEvents/tests/SystemEvents.UserPreference.cs
@@ -128,17 +128,23 @@ public void SignalsUserPreferenceEventsAsynchronously(int message, int uiAction,
             UserPreferenceChangingEventArgs changingArgs = null;
             UserPreferenceChangingEventHandler changingHandler = (o, e) =>
             {
-                changingArgs = e;
-                changing.Set();
+                if (e.Category == expectedCategory)
+                {
+                    changingArgs = e;
+                    changing.Set();
+                }
             };
 
             UserPreferenceChangedEventArgs changedArgs = null;
             UserPreferenceChangingEventArgs changingDuringChanged = null;
             UserPreferenceChangedEventHandler changedHandler = (o, e) =>
             {
-                changedArgs = e;
-                changingDuringChanged = changingArgs;
-                changed.Set();
+                if (e.Category == expectedCategory)
+                {
+                    changedArgs = e;
+                    changingDuringChanged = changingArgs;
+                    changed.Set();
+                }
             };
 
             SystemEvents.UserPreferenceChanging += changingHandler;