diff --git a/libxsmm.spec b/libxsmm.spec
index 5785080..3c593c5 100644
--- a/libxsmm.spec
+++ b/libxsmm.spec
@@ -14,19 +14,27 @@
 # The el6 compiler is too old, but we build for el6 in copr from the
 # same source.
 %if 0%{?el6}
+# devtoolset is necessary
 %bcond_without devtoolset
 %endif
+%if 0%{?el7}
+# system compiler doesn't support avx512
+%bcond_with devtoolset
+%endif
+
+# See check stanza
+%global test 0
 
 Name:		libxsmm
 Version:	1.8.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Small dense or sparse matrix multiplications and convolutions for x86_64
 License:	BSD
 URL:		https://github.com/hfp/libxsmm
 Source0:	https://github.com/hfp/libxsmm/archive/%version.tar.gz#/libxsmm-%version.tar.gz
-BuildRequires:	gcc-gfortran gcc-c++ python openblas-devel
+BuildRequires:	gcc-gfortran gcc-c++ python %{?test:openblas-devel}
 %if %{with devtoolset}
-BuildRequires:	devtoolset-4-gcc-gfortran devtoolset-4-gcc-c++
+BuildRequires:	devtoolset-7-gcc-gfortran devtoolset-7-gcc-c++
 %endif
 ExclusiveArch:	x86_64
 
@@ -80,7 +88,7 @@ chmod 0644 src/template/libxsmm_dnn_convolution_winograd_forward_custom_custom_i
 
 %build
 %if %{with devtoolset}
-PATH=/opt/rh/devtoolset-4/root/usr/bin:$PATH
+PATH=/opt/rh/devtoolset-7/root/usr/bin:$PATH
 %endif
 # OpenMP is only used by libxsmmext, so no need to turn it off.
 # SSE=0 avoids -msse3, given the packaging baseline of SSE2.
@@ -114,8 +122,12 @@ popd
 
 
 %check
-make test
+# Fixme: This rebuilds the libraries (and currently fails due to not
+# linking with -fopenmp).  Disabled pending upstream query.
+%if %{?test}
+make test TEST=1 %makeflags
 rm -r samples/cp2k/{cp2k,build}
+%endif
 
 
 %post -p /sbin/ldconfig
@@ -151,6 +163,10 @@ rm -r samples/cp2k/{cp2k,build}
 
 
 %changelog
+* Tue Dec 19 2017 Dave Love <loveshack@fedoraproject.org> - 1.8.1-4
+- Don't run test
+- Update possible devtoolset usage
+
 * Sun Oct 29 2017 Dave Love <loveshack@fedoraproject.org> - 1.8.1-3
 - Fix spurious executable permission
 - Reinstate %%check