diff --git a/java/CurrentLimits/src/test/java/CurrentLimitTests.java b/java/CurrentLimits/src/test/java/CurrentLimitTests.java
index 5a98cd2c..5c82cb41 100644
--- a/java/CurrentLimits/src/test/java/CurrentLimitTests.java
+++ b/java/CurrentLimits/src/test/java/CurrentLimitTests.java
@@ -26,6 +26,9 @@ public void constructDevices() {
         assert HAL.initialize(500, 0);
 
         talon = new TalonFX(0);
+
+        /* Confirm we get the version code from the Talon before trying to control it */
+        talon.getVersion().waitForUpdate(1.0);
     }
 
     @Test