diff --git a/debian/changelog b/debian/changelog
index 2225518b..11438d0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 libfprint (1:1.90.1-2) UNRELEASED; urgency=medium
 
+  [ Laurent Bigonville ]
   * debian/control: Add libcairo-dev and python3 to build-dependencies as they
     are explicitly required for some tests
 
- -- Laurent Bigonville <bigon@debian.org>  Thu, 13 Feb 2020 17:35:49 +0100
+  [ Sebastien Bacher ]
+  * debian/patches/git_reading_pointer.patch:
+    - backport an upstream fix for a test issue
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 24 Feb 2020 17:08:02 +0100
 
 libfprint (1:1.90.1-1) experimental; urgency=medium
 
diff --git a/debian/patches/git_reading_pointer.patch b/debian/patches/git_reading_pointer.patch
new file mode 100644
index 00000000..648cfa92
--- /dev/null
+++ b/debian/patches/git_reading_pointer.patch
@@ -0,0 +1,37 @@
+From 9e2a7235e38f1e17d4964d6f18d6556ef0186cf1 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Wed, 19 Feb 2020 16:20:33 +0100
+Subject: [PATCH] tests: Fix reading of gboolean into pointer
+
+Otherwise the payload will be lost later on when using GPOINTER_TO_INT
+to cast it back.
+
+See: #236
+---
+ tests/test-device-fake.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test-device-fake.c b/tests/test-device-fake.c
+index cd08537..b6a9ce2 100644
+--- a/tests/test-device-fake.c
++++ b/tests/test-device-fake.c
+@@ -189,6 +189,7 @@ static void
+ fpi_device_fake_capture (FpDevice *device)
+ {
+   FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
++  gboolean wait_for_finger;
+ 
+   fake_dev->last_called_function = fpi_device_fake_capture;
+   g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CAPTURE);
+@@ -199,7 +200,8 @@ fpi_device_fake_capture (FpDevice *device)
+       return;
+     }
+ 
+-  fpi_device_get_capture_data (device, (gboolean *) &fake_dev->action_data);
++  fpi_device_get_capture_data (device, &wait_for_finger);
++  fake_dev->action_data = GINT_TO_POINTER (wait_for_finger);
+   fpi_device_capture_complete (device, fake_dev->ret_image, fake_dev->ret_error);
+ }
+ 
+-- 
+2.24.1
diff --git a/debian/patches/series b/debian/patches/series
index 40f46c77..53368ca4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 # Upstream backports
+git_reading_pointer.patch
 
 # Debian specifics
 udev-rules-creation-add-Debian-specifics.patch