diff --git a/fix-tests.patch b/fix-tests.patch
new file mode 100644
index 0000000..d423d05
--- /dev/null
+++ b/fix-tests.patch
@@ -0,0 +1,47 @@
+--- a/colander/tests/test_colander.py
++++ b/colander/tests/test_colander.py
+@@ -4156,7 +4156,7 @@ class TestTupleSchema(unittest.TestCase)
+         self.assertEqual(schema.children[0], node)
+ 
+ 
+-class TestFunctional(object):
++class FunctionalBase(object):
+     def test_deserialize_ok(self):
+         import colander.tests
+ 
+@@ -4433,7 +4433,7 @@ class TestFunctional(object):
+         self.assertEqual(errors, expected)
+ 
+ 
+-class TestImperative(unittest.TestCase, TestFunctional):
++class TestImperative(unittest.TestCase, FunctionalBase):
+     def _makeSchema(self, name='schema'):
+         import colander
+ 
+@@ -4472,7 +4472,7 @@ class TestImperative(unittest.TestCase,
+         return schema
+ 
+ 
+-class TestDeclarative(unittest.TestCase, TestFunctional):
++class TestDeclarative(unittest.TestCase, FunctionalBase):
+     def _makeSchema(self, name='schema'):
+         import colander
+ 
+@@ -4503,7 +4503,7 @@ class TestDeclarative(unittest.TestCase,
+         return schema
+ 
+ 
+-class TestUltraDeclarative(unittest.TestCase, TestFunctional):
++class TestUltraDeclarative(unittest.TestCase, FunctionalBase):
+     def _makeSchema(self, name='schema'):
+         import colander
+ 
+@@ -4547,7 +4547,7 @@ class TestUltraDeclarative(unittest.Test
+         return schema
+ 
+ 
+-class TestDeclarativeWithInstantiate(unittest.TestCase, TestFunctional):
++class TestDeclarativeWithInstantiate(unittest.TestCase, FunctionalBase):
+     def _makeSchema(self, name='schema'):
+         import colander
+ 
diff --git a/python-colander.changes b/python-colander.changes
index 4cbd30c..8907915 100644
--- a/python-colander.changes
+++ b/python-colander.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 17 08:10:18 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Add fix-tests.patch allowing use of pytest (gh#Pylons/colander#210)
+
 -------------------------------------------------------------------
 Mon Oct 14 11:44:08 UTC 2019 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-colander.spec b/python-colander.spec
index f6f607f..577296f 100644
--- a/python-colander.spec
+++ b/python-colander.spec
@@ -25,6 +25,9 @@ Summary:        A schema-based serialization and deserialization library
 License:        BSD-4-Clause AND ZPL-2.1 AND MIT
 URL:            https://github.com/Pylons/colander
 Source:         https://files.pythonhosted.org/packages/source/c/colander/colander-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM fix-tests.patch gh#Pylons/colander#210 mcepl@suse.com
+# Fix tests to work with pytest (and nose2) as well
+Patch0:         fix-tests.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module translationstring}
 BuildRequires:  fdupes
@@ -41,9 +44,9 @@ BuildRequires:  %{python_module pylons-sphinx-themes}
 BuildRequires:  %{python_module coverage}
 BuildRequires:  %{python_module hupper}
 BuildRequires:  %{python_module iso8601}
-BuildRequires:  %{python_module nose}
 BuildRequires:  %{python_module plaster-pastedeploy}
 BuildRequires:  %{python_module plaster}
+BuildRequires:  %{python_module pytest}
 # /SECTION
 %python_subpackages
 
@@ -82,6 +85,7 @@ Provides translations for the "%{name}" package.
 
 %prep
 %setup -q -n colander-%{version}
+%autopatch -p1
 
 %build
 %python_build
@@ -94,7 +98,7 @@ Provides translations for the "%{name}" package.
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%python_exec setup.py nosetests --with-coverage
+%pytest
 
 %files %{python_files}
 %license LICENSE.txt