diff --git a/libosmo-abis.changes b/libosmo-abis.changes
index 809788b..a3ce27d 100644
--- a/libosmo-abis.changes
+++ b/libosmo-abis.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Mar 25 08:57:52 UTC 2018 - jengelh@inai.de
+
+- Show testsuite.log when tests are failing.
+
 -------------------------------------------------------------------
 Mon Oct  2 22:48:02 UTC 2017 - jengelh@inai.de
 
diff --git a/libosmo-abis.spec b/libosmo-abis.spec
index f09bfbc..692326c 100644
--- a/libosmo-abis.spec
+++ b/libosmo-abis.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libosmo-abis
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@ Name:           libosmo-abis
 Version:        0.4.0.2
 Release:        0
 Summary:        Osmocom library for A-bis interface between BTS and BSC
-License:        AGPL-3.0+ and GPL-2.0+
+License:        AGPL-3.0-or-later AND GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
 Url:            https://osmocom.org/projects/libosmo-abis/wiki/Libosmo-abis
 
@@ -47,7 +47,7 @@ frequency allocation in the BTS.
 
 %package -n libosmoabis6
 Summary:        Osmocom GSM A-bis interface library
-License:        AGPL-3.0+
+License:        AGPL-3.0-or-later
 Group:          System/Libraries
 
 %description -n libosmoabis6
@@ -62,7 +62,7 @@ cards, as well as some A-bis/IP dialects.
 
 %package -n libosmoabis-devel
 Summary:        Development files for the Osmocom GSM A-bis library
-License:        AGPL-3.0+
+License:        AGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libosmoabis6 = %version
 Requires:       libosmocore-devel >= 0.3.0
@@ -78,7 +78,7 @@ applications that want to make use of libosmoabis.
 
 %package -n libosmotrau2
 Summary:        Osmocom GSM TRAU (E1/RTP) library
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Libraries
 
 %description -n libosmotrau2
@@ -90,7 +90,7 @@ Switching Center (MSC) is designed.
 
 %package -n libosmotrau-devel
 Summary:        Development files for the Osmocom TRAU (E1/RTP) library
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libosmotrau2 = %version
 
@@ -117,10 +117,12 @@ make %{?_smp_mflags} install DESTDIR="$b"
 find "$b/%_libdir" -type f -name "*.la" -delete
 
 %check
-make %{?_smp_mflags} check \
-%ifnarch %ix86 x86_64
-	|| :
+if ! make %{?_smp_mflags} check; then
+	find . -name testsuite.log -exec cat "{}" "+"
+%ifarch %ix86 x86_64
+	exit 1
 %endif
+fi
 
 %post   -n libosmoabis6 -p /sbin/ldconfig
 %postun -n libosmoabis6 -p /sbin/ldconfig