diff --git a/0001-Update-text-expectation.patch b/0001-Update-text-expectation.patch
new file mode 100644
index 0000000..6f66ed9
--- /dev/null
+++ b/0001-Update-text-expectation.patch
@@ -0,0 +1,29 @@
+From 17170a1eeb63807b4035427f3ca2b3e475c8f42b Mon Sep 17 00:00:00 2001
+From: Khaled Hosny <khaled@aliftype.com>
+Date: Wed, 25 Aug 2021 16:58:25 +0200
+Subject: [PATCH] Update text expectation
+
+---
+ tests/cursor_position_GB8a.test | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/cursor_position_GB8a.test b/tests/cursor_position_GB8a.test
+index bef963e..d161691 100644
+--- a/tests/cursor_position_GB8a.test
++++ b/tests/cursor_position_GB8a.test
+@@ -32,9 +32,9 @@ glyph [0]	x_offset: 0	y_offset: 0	x_advance: 748	font: Amiri
+ glyph [0]	x_offset: 0	y_offset: 0	x_advance: 748	font: Amiri
+ glyph [0]	x_offset: 0	y_offset: 0	x_advance: 748	font: Amiri
+ 
+-UTF-32 clusters: 00 01 02 03
+-UTF-8 clusters:  00 04 08 12
++UTF-32 clusters: 00 00 02 02
++UTF-8 clusters:  00 00 08 08
+ 
+-The position is 2992 at index 12
++The position is 2244 at index 8
+ 
+ The start-index is 4  at position 1000 
+-- 
+2.31.1
+
diff --git a/libraqm.spec b/libraqm.spec
index 295ceba..d7142f4 100644
--- a/libraqm.spec
+++ b/libraqm.spec
@@ -1,11 +1,13 @@
 Name:				libraqm
 Version:			0.7.0
-Release:			8%{?dist}
+Release:			9%{?dist}
 License:			MIT
 Summary:			Complex Textlayout Library
 Summary(ar):		مكتبة رقم للنّصوص المركّبة
 URL:				https://github.com/HOST-Oman/libraqm
 Source:				https://github.com/HOST-Oman/libraqm/releases/download/v%{version}/raqm-%{version}.tar.gz
+# Backported from upstream
+Patch0:				0001-Update-text-expectation.patch
 
 %if 0%{?el7}
 BuildRequires:      python2
@@ -54,7 +56,7 @@ This package contains documentation files for raqm.
 وثائق مكتبة رقم.
 
 %prep
-%setup -q -n raqm-%{version}
+%autosetup -p1 -n raqm-%{version}
 %if ! 0%{?el7}
 sed s:python:%{__python3}:g -i tests/Makefile.in #Fixed in next release on upstream
 %endif
@@ -94,6 +96,9 @@ rm -f %{buildroot}%{_libdir}/*.{la,a}
 %{_datadir}/gtk-doc/html/raqm
 
 %changelog
+* Sat Oct 02 2021 Kalev Lember <klember@redhat.com> - 0.7.0-9
+- Backport upstream patch to fix failing self tests (#1987659)
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild