diff --git a/components/RichSuggestBox/tests/Test_RichSuggestBox.cs b/components/RichSuggestBox/tests/Test_RichSuggestBox.cs
index eef67bff..f7b3e699 100644
--- a/components/RichSuggestBox/tests/Test_RichSuggestBox.cs
+++ b/components/RichSuggestBox/tests/Test_RichSuggestBox.cs
@@ -145,13 +145,13 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             // Delete token as a whole
             selection.Delete(TextRangeUnit.Character, -1);
             selection.Delete(TextRangeUnit.Link, -1);
-            await Task.Delay(10);
+            await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
 
             Assert.AreEqual(1, rsb.Tokens.Count, "Unexpected token count after deleting token 2");
 
             // Partially delete a token
             selection.Delete(TextRangeUnit.Character, -2);
-            await Task.Delay(10);
+            await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
 
             Assert.AreEqual(0, rsb.Tokens.Count, "Unexpected token count after deleting token 1");
         });
@@ -173,7 +173,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             AssertToken(rsb, tokenBefore);
 
             selection.Delete(TextRangeUnit.Character, -2);
-            await Task.Delay(10);
+            await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
 
             await AddTokenAsync(rsb, "@After");
             var tokenAfter = rsb.Tokens[0];
@@ -203,17 +203,17 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             await AddTokenAsync(rsb, "@Token2");
             selection.Delete(TextRangeUnit.Character, -1);
 
-            await Task.Delay(10);
+            await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
             selection.SetText(TextSetOptions.Unhide, "text");
             Assert.AreEqual(defaultFormat.BackgroundColor, selection.CharacterFormat.BackgroundColor, "Raw text have background color after a token.");
 
             selection.SetRange(middlePosition, middlePosition);
-            await Task.Delay(10);
+            await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
             selection.SetText(TextSetOptions.Unhide, "text");
             Assert.AreEqual(defaultFormat.BackgroundColor, selection.CharacterFormat.BackgroundColor, "Raw text have background color when sandwiched between 2 tokens.");
 
             selection.SetRange(0, 0);
-            await Task.Delay(10);
+            await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
             selection.SetText(TextSetOptions.Unhide, "text");
             Assert.AreEqual(defaultFormat.BackgroundColor, selection.CharacterFormat.BackgroundColor, "Raw text have background color when insert at beginning of the document.");
         });
@@ -302,7 +302,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             selection.TypeText("after");
 
             rsb.Load(rtf, new[] { token1, token2 });
-            await Task.Delay(10);
+            await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
             document.GetText(TextGetOptions.NoHidden, out var text);
 
             Assert.AreEqual(2, rsb.Tokens.Count, "Unexpected tokens count after load.");
@@ -358,8 +358,8 @@ private static async Task AddTokenAsync(RichSuggestBox rsb, string tokenText)
     {
         var selection = rsb.TextDocument!.Selection;
         selection.TypeText(tokenText);
-        await Task.Delay(10);   // Wait for SelectionChanged to be invoked
+        await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });   // Wait for SelectionChanged to be invoked
         await rsb.CommitSuggestionAsync(tokenText);
-        await Task.Delay(10);   // Wait for TextChanged to be invoked
+        await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });   // Wait for TextChanged to be invoked
     }
 }