diff --git a/_constraints b/_constraints
index 2baa0ce..0d32d84 100644
--- a/_constraints
+++ b/_constraints
@@ -4,7 +4,7 @@
       <size unit="G">8</size>
     </physicalmemory>
     <disk>
-      <size unit="G">6</size>
+      <size unit="G">9</size>
     </disk>
   </hardware>
 </constraints>
diff --git a/python-numpy.changes b/python-numpy.changes
index e9ac3a0..17fd0ec 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov  9 15:27:58 UTC 2021 - Andreas Schwab <schwab@suse.de>
+
+- Expect failure of test_fpclass and test_float on riscv64
+- Bump disk space constraint
+
 -------------------------------------------------------------------
 Wed Oct  6 19:16:45 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-numpy.spec b/python-numpy.spec
index 1f6d499..7ba42f6 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -279,6 +279,12 @@ test_failok+=" or test_pareto"
 # gh#numpy/numpy#18388
 test_failok+=" or test_float_remainder_overflow"
 %endif
+%ifarch riscv64
+# These tests fail due to non-portable assumptions about the signbit of NaN
+# gh#numpy/numpy#8213
+test_failok+=" or test_fpclass"
+test_failok+=" or test_float"
+%endif
 %{python_expand # for all python3 flavors
 export PYTHONPATH=%{buildroot}%{$python_sitearch}
 export PYTHONDONTWRITEBYTECODE=1