diff --git a/python-DataShape.changes b/python-DataShape.changes
index 113a6e1..47d4a55 100644
--- a/python-DataShape.changes
+++ b/python-DataShape.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  2 11:14:09 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Skip python36 build
+- Enable test suite
+
 -------------------------------------------------------------------
 Thu May  3 14:07:08 UTC 2018 - toddrme2178@gmail.com
 
diff --git a/python-DataShape.spec b/python-DataShape.spec
index b49889b..d303fe1 100644
--- a/python-DataShape.spec
+++ b/python-DataShape.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-DataShape
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,36 +12,34 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%bcond_without tests
-
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python36 1
+%bcond_without python2
 Name:           python-DataShape
 Version:        0.5.4
 Release:        0
 Summary:        A data description language
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Url:            https://github.com/blaze/datashape/
+URL:            https://github.com/blaze/datashape/
 Source:         https://github.com/blaze/datashape/archive/%{version}.tar.gz
-BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module multipledispatch >= 0.4.7}
-BuildRequires:  %{python_module numpy-devel >= 1.7}
+BuildRequires:  %{python_module numpy >= 1.7}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module python-dateutil}
 BuildRequires:  %{python_module setuptools}
+%if %{with python2}
+BuildRequires:  python2-mock
+%endif
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-%if %{with tests}
-BuildRequires:  %{python_module mock}
-BuildRequires:  %{python_module pytest}
-%endif
 Requires:       python-multipledispatch >= 0.4.7
 Requires:       python-numpy >= 1.7
 Requires:       python-python-dateutil
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %python_subpackages
 
@@ -59,11 +57,17 @@ NumPy dtype with an emphasis on cross language support.
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+%check
+# marking xfail works differently nowadays -- https://github.com/blaze/datashape/issues/78
+donttest+=" or test_arbitrary_string and (s4 or s5 or s6)"
+# https://github.com/blaze/datashape/issues/232
+donttest+=" or test_user and (test_validate or test_nested_iteratables or test_tuples_can_be_records_too)"
+%pytest -k "not (${donttest:4})"
+
 %files %{python_files}
-%defattr(-,root,root,-)
 %doc  README.rst
 %license LICENSE
-%{python_sitelib}/datashape-%{version}-py*.egg-info
+%{python_sitelib}/datashape-%{version}*-info
 %{python_sitelib}/datashape/
 
 %changelog