diff --git a/mpdecimal-2.5.0-tests-fix.patch b/mpdecimal-2.5.0-tests-fix.patch
new file mode 100644
index 0000000..8debf82
--- /dev/null
+++ b/mpdecimal-2.5.0-tests-fix.patch
@@ -0,0 +1,18 @@
+diff -ur mpdecimal-2.5.0/libmpdec++/decimal.hh mpdecimal-2.5.0/libmpdec++/decimal.hh
+--- mpdecimal-2.5.0/libmpdec++/decimal.hh     2020-06-27 21:41:49.000000000 +0200
++++ mpdecimal-2.5.0/libmpdec++/decimal.hh     2020-08-05 13:39:26.570886524 +0200
+@@ -47,9 +47,13 @@
+ #include "mpdecimal.h"
+
+
++#undef iscanonical /* math.h */
+ #undef isfinite    /* math.h */
++#undef isinf       /* math.h */
+ #undef isnan       /* math.h */
++#undef isnormal    /* math.h */
+ #undef issubnormal /* math.h */
++#undef iszero      /* math.h */
+ #undef isspecial   /* ctype.h */
+
+ #ifdef _MSC_VER
+ 
\ No newline at end of file
diff --git a/mpdecimal.spec b/mpdecimal.spec
index aeae653..afdf8cb 100644
--- a/mpdecimal.spec
+++ b/mpdecimal.spec
@@ -3,7 +3,7 @@
 
 Name:           mpdecimal
 Version:        2.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for general decimal arithmetic
 License:        BSD
 
@@ -15,6 +15,9 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  unzip
 
+# Patch provided by upstream
+Patch0:         mpdecimal-2.5.0-tests-fix.patch
+
 %description
 The package contains a library limpdec implementing General Decimal Arithmetic
 Specification. The specification, written by Mike Cowlishaw from IBM, defines
@@ -43,7 +46,7 @@ Provides:       bundled(js-underscore) = 1.4.4
 The package contains documentation for the mpdecimal library.
 
 %prep
-%autosetup
+%autosetup -p1
 unzip -d tests/testdata %{SOURCE1}
 
 %build
@@ -57,9 +60,7 @@ unzip -d tests/testdata %{SOURCE1}
 make %{?_smp_mflags}
 
 %check
-# Temporaly disabled the tests because test suite compilation
-# fails on s390x, aarch64 and armv7hl, problem reported upstream
-#make check
+make check
 
 %install
 %make_install
@@ -92,6 +93,9 @@ fi
 %ldconfig_scriptlets
 
 %changelog
+* Thu Aug  6 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.0-2
+- Re-enabled tests
+
 * Wed Aug  5 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.0-1
 - New version
   Resolves: rhbz#1851761