diff --git a/wpilibc/src/test/native/cpp/InterruptTest.cpp b/wpilibc/src/test/native/cpp/InterruptTest.cpp
index d0cc2c0822..8b054d75f5 100644
--- a/wpilibc/src/test/native/cpp/InterruptTest.cpp
+++ b/wpilibc/src/test/native/cpp/InterruptTest.cpp
@@ -57,9 +57,8 @@ TEST(InterruptTest, RisingEdge) {
   interrupt.SetInterruptEdges(true, true);
   DIOSim digitalSim{di};
   digitalSim.SetValue(false);
-  frc::Wait(0.5_s);
   interrupt.Enable();
-  frc::Wait(20_ms);
+  frc::Wait(0.5_s);
   digitalSim.SetValue(true);
   frc::Wait(20_ms);
 
@@ -87,9 +86,8 @@ TEST(InterruptTest, FallingEdge) {
   interrupt.SetInterruptEdges(true, true);
   DIOSim digitalSim{di};
   digitalSim.SetValue(true);
-  frc::Wait(0.5_s);
   interrupt.Enable();
-  frc::Wait(20_ms);
+  frc::Wait(0.5_s);
   digitalSim.SetValue(false);
   frc::Wait(20_ms);
 
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/InterruptTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/InterruptTest.java
index a392fc6c8e..7855d89753 100644
--- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/InterruptTest.java
+++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/InterruptTest.java
@@ -62,9 +62,8 @@ class InterruptTest {
       interrupt.setInterruptEdges(true, true);
       DIOSim digitalSim = new DIOSim(di);
       digitalSim.setValue(false);
-      Timer.delay(0.5);
       interrupt.enable();
-      Timer.delay(0.02);
+      Timer.delay(0.5);
       digitalSim.setValue(true);
       Timer.delay(0.02);
 
@@ -99,9 +98,8 @@ class InterruptTest {
       interrupt.setInterruptEdges(true, true);
       DIOSim digitalSim = new DIOSim(di);
       digitalSim.setValue(true);
-      Timer.delay(0.5);
       interrupt.enable();
-      Timer.delay(0.02);
+      Timer.delay(0.5);
       digitalSim.setValue(false);
       Timer.delay(0.02);