diff --git a/SOURCES/0002-xfail-TestCond.test_nan_unonditionally.patch b/SOURCES/0002-xfail-TestCond.test_nan_unonditionally.patch
new file mode 100644
index 0000000..3c2432b
--- /dev/null
+++ b/SOURCES/0002-xfail-TestCond.test_nan_unonditionally.patch
@@ -0,0 +1,14 @@
+diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py
+index 24663b1..665bf0e 100644
+--- a/numpy/linalg/tests/test_linalg.py
++++ b/numpy/linalg/tests/test_linalg.py
+@@ -759,6 +759,9 @@ class TestCond(CondCases):
+         for A, p in itertools.product(As, p_neg):
+             linalg.cond(A, p)
+ 
++    @pytest.mark.xfail(True, run=False,
++                       reason="Platform/LAPACK-dependent failure, "
++                              "see gh-18914")
+     def test_nan(self):
+         # nans should be passed through, not converted to infs
+         ps = [None, 1, -1, 2, -2, 'fro']
diff --git a/SPECS/numpy.spec b/SPECS/numpy.spec
index ed99d11..14d1aac 100644
--- a/SPECS/numpy.spec
+++ b/SPECS/numpy.spec
@@ -8,7 +8,7 @@
 
 Name:           numpy
 Version:        1.17.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 # Everything is BSD except for class SafeEval in numpy/lib/utils.py which is Python
@@ -18,6 +18,8 @@ Source0:        https://github.com/%{name}/%{name}/releases/download/v%{version}
 Source1:        https://docs.scipy.org/doc/numpy/numpy-html-1.17.0.zip
 # Upstream issue: https://github.com/numpy/numpy/issues/13173
 Patch0:         0001-Remove-failing-test-from-linalg-module.patch
+# Upstream PR:  https://github.com/numpy/numpy/pull/18943
+Patch1:         0002-xfail-TestCond.test_nan_unonditionally.patch
 
 # Exclude i686 arch. Due to a modularity issue it's being added to the
 # x86_64 compose of CRB, but we don't want to ship it at all.
@@ -163,7 +165,7 @@ touch %{buildroot}%{_bindir}/f2py3
 
 %check
 %if %{with tests}
-%if %{_arch} != s390x && %{_arch} != ppc64le
+%if "%{_arch}" != "s390x" && "%{_arch}" != "ppc64le"
 %{__python3} runtests.py -v
 %endif
 %endif
@@ -215,9 +217,13 @@ fi
 
 
 %changelog
-* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.17.3-6
+* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.17.3-7
 - Rebuilt for MSVSphere 8.8
 
+* Mon Jul 17 2023 Charalampos Stratakis <cstratak@redhat.com> - 1.17.3-7
+- Skip TestCond.test_nan
+- Resolves: rhbz#2217862
+
 * Mon Aug 02 2021 Tomas Orsava <torsava@redhat.com> - 1.17.3-6
 - Adjusted the postun scriptlets to enable upgrading to RHEL 9
 - Resolves: rhbz#1933055