diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/launcher/TestServiceInterruptHandling.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/launcher/TestServiceInterruptHandling.java
index bd779e4a0c..c21fa8b730 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/launcher/TestServiceInterruptHandling.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/launcher/TestServiceInterruptHandling.java
@@ -20,6 +20,7 @@
 
 import org.apache.hadoop.service.BreakableService;
 import org.apache.hadoop.service.launcher.testservices.FailureTestService;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.util.ExitUtil;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -43,10 +44,8 @@ public void testRegisterAndRaise() throws Throwable {
     assertEquals(0, irqHandler.getSignalCount());
     irqHandler.raise();
     // allow for an async event
-    Thread.sleep(500);
-    IrqHandler.InterruptData data = catcher.interruptData;
-    assertNotNull("interrupt data", data);
-    assertEquals(name, data.getName());
+    GenericTestUtils.waitFor(() -> catcher.interruptData != null, 100, 10000);
+    assertEquals(name, catcher.interruptData.getName());
     assertEquals(1, irqHandler.getSignalCount());
   }