diff --git a/pyatspi-test-fixes.patch b/pyatspi-test-fixes.patch
new file mode 100644
index 0000000..33fee1b
--- /dev/null
+++ b/pyatspi-test-fixes.patch
@@ -0,0 +1,48 @@
+From f2e40852cf29a781ef5682fd675cd3e15d69f277 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Mon, 27 Sep 2021 16:41:40 -0500
+Subject: [PATCH] Testsuite fixes
+
+---
+ tests/dummyatk/my-atk-hyperlink.h | 2 ++
+ tests/dummyatk/my-atk-object.c    | 5 ++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/dummyatk/my-atk-hyperlink.h b/tests/dummyatk/my-atk-hyperlink.h
+index 35af13e..c07bc34 100644
+--- a/tests/dummyatk/my-atk-hyperlink.h
++++ b/tests/dummyatk/my-atk-hyperlink.h
+@@ -50,5 +50,7 @@ struct _MyAtkHyperlinkClass
+     AtkHyperlinkClass parent;
+ };
+ 
++MyAtkHyperlink* my_atk_hyperlink_new(gint start_index, gint end_index,const gchar* uri);
++
+ GType my_atk_hyperlink_get_type();
+ #endif /*MY_ATK_HYPERLINK_H*/
+diff --git a/tests/dummyatk/my-atk-object.c b/tests/dummyatk/my-atk-object.c
+index 2b69583..218cc9e 100644
+--- a/tests/dummyatk/my-atk-object.c
++++ b/tests/dummyatk/my-atk-object.c
+@@ -116,7 +116,8 @@ static AtkStateSet *my_atk_object_ref_state_set(AtkObject *accessible)
+ 
+     if (obj->state_set == NULL)
+         obj->state_set = atk_state_set_new();
+-    return g_object_ref(G_OBJECT(obj->state_set));
++    g_object_ref(obj->state_set);
++    return obj->state_set;
+ }
+ 
+ static AtkAttributeSet *my_atk_object_get_attributes (AtkObject *accessible)
+@@ -139,6 +140,8 @@ static AtkAttributeSet *my_atk_object_get_attributes (AtkObject *accessible)
+     rs = g_slist_append(rs, (gpointer) a); 
+     rs = g_slist_append(rs, (gpointer) b); 
+     rs = g_slist_append(rs, (gpointer) c); 
++
++    return rs;
+ }
+ 
+ //function, needed in instance_finalize()
+-- 
+2.33.0
+
diff --git a/python-atspi.changes b/python-atspi.changes
index 905add5..e92ec54 100644
--- a/python-atspi.changes
+++ b/python-atspi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 27 21:45:41 UTC 2021 - Michael Gorse <mgorse@suse.com>
+
+- Add pyatspi-test-fixes.patch: fix tests on s390x (bsc#1190051).
+
 -------------------------------------------------------------------
 Wed Aug 11 08:43:40 UTC 2021 - Yifan Jiang <yfjiang@suse.com>
 
diff --git a/python-atspi.spec b/python-atspi.spec
index a6fa103..4907906 100644
--- a/python-atspi.spec
+++ b/python-atspi.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-atspi
+# spec file
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -41,6 +41,8 @@ License:        LGPL-2.0-only
 Group:          Development/Libraries/Python
 URL:            https://gitlab.gnome.org/GNOME/pyatspi2
 Source0:        https://download.gnome.org/sources/pyatspi/2.38/%{_name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM pyatspi-test-fixes.patch bsc#1190051 mgorse@suse.com -- testsuite fixes.
+Patch0:         pyatspi-test-fixes.patch
 BuildRequires:  %{python_module dbus-python}
 BuildRequires:  %{python_module gobject >= 2.90.1}
 BuildRequires:  %{python_module gobject-devel >= 2.90.1}
@@ -85,7 +87,7 @@ accessibility toolkit. This version is based on dbus.
 This package contains the python bindings for AT-SPI.
 
 %prep
-%setup -q -n %{_name}-%{version}
+%autosetup -p1 -n %{_name}-%{version}
 
 %build
 # Configure for out-of-tree builds