diff --git a/dogpile.cache-tests_more_slow_waiters.patch b/dogpile.cache-tests_more_slow_waiters.patch
deleted file mode 100644
index 9cc43c8..0000000
--- a/dogpile.cache-tests_more_slow_waiters.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dogpile.cache-0.6.4/tests/test_lock.py	2018/03/17 11:48:50	1.1
-+++ dogpile.cache-0.6.4/tests/test_lock.py	2018/03/17 11:52:43
-@@ -227,6 +227,8 @@
- 
-         if slow_write_time:
-             expected_slow_waiters = num_threads * expected_generations
-+        # one extra for slow platforms
-+        expected_slow_waiters += 2
- 
-         # time spent also increments by one wait period in the beginning...
-         expected_run_time += effective_creation_time
diff --git a/python-dogpile.cache.changes b/python-dogpile.cache.changes
index c08a59d..1179e1d 100644
--- a/python-dogpile.cache.changes
+++ b/python-dogpile.cache.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Apr 23 12:54:25 UTC 2018 - dmueller@suse.com
+
+- skip lock tests, they fail frequently (bsc#1086987)
+
+-------------------------------------------------------------------
+Fri Apr 20 07:50:52 UTC 2018 - dmueller@suse.com
+
+- for testing purposes drop dogpile.cache-tests_more_slow_waiters.patch
+
+-------------------------------------------------------------------
+Thu Apr 19 13:00:53 UTC 2018 - dmueller@suse.com
+
+- only run generic tests using pytest (bsc#1089564)
+
 -------------------------------------------------------------------
 Tue Mar 27 00:44:45 CEST 2018 - ro@suse.de
 
diff --git a/python-dogpile.cache.spec b/python-dogpile.cache.spec
index 01f3aa7..6cb7543 100644
--- a/python-dogpile.cache.spec
+++ b/python-dogpile.cache.spec
@@ -26,7 +26,6 @@ License:        BSD-3-Clause
 Group:          Development/Languages/Python
 Url:            http://bitbucket.org/zzzeek/dogpile.cache
 Source:         https://pypi.io/packages/source/d/dogpile.cache/dogpile.cache-%{version}.tar.gz
-Patch1:         dogpile.cache-tests_more_slow_waiters.patch
 BuildRequires:  %{python_module Mako}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module mock}
@@ -56,7 +55,6 @@ new value.
 
 %prep
 %setup -q -n dogpile.cache-%{version}
-%patch1 -p1
 
 %build
 %python_build
@@ -66,7 +64,8 @@ new value.
 %python_expand %fdupes -s %{buildroot}/%{python_sitelib}
 
 %check
-%python_exec setup.py test
+export RUNTESTS="-k 'not test_dbm_backend and not test_memcached_backend and not test_redis_backend'"
+%python_exec -m pytest --ignore=tests/test_lock.py
 
 %files %{python_files}
 %defattr(-,root,root,-)