diff --git a/photon-lib/src/test/java/org/photonvision/PhotonCameraTest.java b/photon-lib/src/test/java/org/photonvision/PhotonCameraTest.java
index c25955480d..8d69034197 100644
--- a/photon-lib/src/test/java/org/photonvision/PhotonCameraTest.java
+++ b/photon-lib/src/test/java/org/photonvision/PhotonCameraTest.java
@@ -193,9 +193,6 @@ private void configureInstanceDataLoggers(NetworkTableInstance inst, String name
     @MethodSource("testNtOffsets")
     public void testRestartingRobotAndCoproc(
             int robotStart, int coprocStart, int robotRestart, int coprocRestart) throws Throwable {
-        // See #1574 - test flakey, disabled until we address this
-        assumeTrue(false);
-
         var robotNt = NetworkTableInstance.create();
         var coprocNt = NetworkTableInstance.create();
 
diff --git a/photon-lib/src/test/java/org/photonvision/VisionSystemSimTest.java b/photon-lib/src/test/java/org/photonvision/VisionSystemSimTest.java
index d4c324965c..51b2ad310e 100644
--- a/photon-lib/src/test/java/org/photonvision/VisionSystemSimTest.java
+++ b/photon-lib/src/test/java/org/photonvision/VisionSystemSimTest.java
@@ -67,7 +67,6 @@
 import org.photonvision.simulation.VisionTargetSim;
 import org.photonvision.targeting.PhotonTrackedTarget;
 
-// See #1574 - flakey on windows and also linux, so commenting out until we bump wpilib
 class VisionSystemSimTest {
     private static final double kRotDeltaDeg = 0.25;
 
@@ -85,9 +84,6 @@ public static void setUp() {
         }
 
         OpenCvLoader.forceStaticLoad();
-
-        // See #1574 - test flakey, disabled until we address this
-        assumeTrue(false);
     }
 
     @BeforeEach
diff --git a/photon-targeting/build.gradle b/photon-targeting/build.gradle
index dd2f628d16..31cca01b45 100644
--- a/photon-targeting/build.gradle
+++ b/photon-targeting/build.gradle
@@ -72,6 +72,7 @@ model {
             nativeUtils.useRequiredLibrary(it, "wpimath_shared")
             nativeUtils.useRequiredLibrary(it, "wpinet_shared")
             nativeUtils.useRequiredLibrary(it, "ntcore_shared")
+            nativeUtils.useRequiredLibrary(it, "wpilibc_shared")
         }
         "${nativeName}JNI"(JniNativeLibrarySpec) {
 
@@ -245,7 +246,7 @@ def nativeTasks = wpilibTools.createExtractionTasks {
 }
 
 nativeTasks.addToSourceSetResources(sourceSets.test)
-
+nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpilibc")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpiutil")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpimath")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpinet")
diff --git a/photon-targeting/src/main/java/org/photonvision/jni/WpilibLoader.java b/photon-targeting/src/main/java/org/photonvision/jni/WpilibLoader.java
index ccaf03cef1..44093d9d21 100644
--- a/photon-targeting/src/main/java/org/photonvision/jni/WpilibLoader.java
+++ b/photon-targeting/src/main/java/org/photonvision/jni/WpilibLoader.java
@@ -50,6 +50,7 @@ public static boolean loadLibraries() {
             CombinedRuntimeLoader.loadLibraries(
                     WpilibLoader.class,
                     "wpimathjni",
+                    "wpilibc",
                     "ntcorejni",
                     "wpinetjni",
                     "wpiHaljni",