diff --git a/src/System.Device.Gpio.Tests/GpioControllerTestBase.cs b/src/System.Device.Gpio.Tests/GpioControllerTestBase.cs
index e9ffe5a1fd..d6222fadf5 100644
--- a/src/System.Device.Gpio.Tests/GpioControllerTestBase.cs
+++ b/src/System.Device.Gpio.Tests/GpioControllerTestBase.cs
@@ -230,9 +230,17 @@ void Callback(object sender, PinValueChangedEventArgs pinValueChangedEventArgs)
     [Fact]
     public void AddCallbackFallingEdgeNotDetectedTest()
     {
+        var driver = GetTestDriver();
+        if (driver is SysFsDriver)
+        {
+            // This test is unreliable (flaky) with SysFs.
+            // See https://github.com/dotnet/iot/issues/629 and possibly https://github.com/dotnet/iot/issues/1581
+            return;
+        }
+
         bool wasCalled = false;
         AutoResetEvent ev = new AutoResetEvent(false);
-        using (GpioController controller = new GpioController(GetTestNumberingScheme(), GetTestDriver()))
+        using (GpioController controller = new GpioController(GetTestNumberingScheme(), driver))
         {
             controller.OpenPin(InputPin, PinMode.Input);
             controller.OpenPin(OutputPin, PinMode.Output);