diff --git a/python-fields.changes b/python-fields.changes
index cfdafbe..e40e1d0 100644
--- a/python-fields.changes
+++ b/python-fields.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 13 09:58:09 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Clean up with spec-cleaner
+- Make sure the tests are not conditioned
+- Use %license macro
+
 -------------------------------------------------------------------
 Wed Oct 18 16:43:04 UTC 2017 - toddrme2178@gmail.com
 
diff --git a/python-fields.spec b/python-fields.spec
index d111571..a402c7f 100644
--- a/python-fields.spec
+++ b/python-fields.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-fields
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,45 +12,38 @@
 # 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/
 #
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_with     test
 Name:           python-fields
 Version:        5.0.0
 Release:        0
 Summary:        Container class boilerplate killer
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Url:            https://github.com/ionelmc/python-fields
+URL:            https://github.com/ionelmc/python-fields
 Source:         https://files.pythonhosted.org/packages/source/f/fields/fields-%{version}.tar.gz
+BuildRequires:  %{python_module attr}
+BuildRequires:  %{python_module characteristic}
 BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pytest-benchmark}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-%if %{with test}
-BuildRequires:  %{python_module attr}
-BuildRequires:  %{python_module characteristic}
-BuildRequires:  %{python_module pytest-benchmark}
-BuildRequires:  %{python_module pytest}
-%endif
 BuildArch:      noarch
-
 %python_subpackages
 
 %description
-
 Container class boilerplate killer.
-
 Features:
-
-* Human-readable ``__repr__``
-* Complete set of comparison methods
-* Keyword and positional argument support. Works like a normal class - you can override just about anything in the
-  subclass (eg: a custom ``__init__``). In contrast, `hynek/characteristic <https://github.com/hynek/characteristic>`_
-  forces different call schematics and calls your ``__init__`` with different arguments.
+  * Human-readable ``__repr__``
+  * Complete set of comparison methods
+  * Keyword and positional argument support. Works like a normal class - you can override just about anything in the
+    subclass (eg: a custom ``__init__``). In contrast, `hynek/characteristic <https://github.com/hynek/characteristic>`_
+    forces different call schematics and calls your ``__init__`` with different arguments.
 
 %prep
 %setup -q -n fields-%{version}
@@ -62,14 +55,12 @@ Features:
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%if %{with test}
 %check
-%python_expand py.test-%{$python_bin_suffix}
-%endif
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} tests/
 
 %files %{python_files}
-%defattr(-,root,root,-)
-%doc AUTHORS.rst CHANGELOG.rst LICENSE README.rst
+%license LICENSE
+%doc AUTHORS.rst CHANGELOG.rst README.rst
 %{python_sitelib}/*
 
 %changelog