diff --git a/couchdb-0020-Fix-CouchDB-stopping-in-tests.patch b/couchdb-0020-Fix-CouchDB-stopping-in-tests.patch
new file mode 100644
index 0000000..835bfe5
--- /dev/null
+++ b/couchdb-0020-Fix-CouchDB-stopping-in-tests.patch
@@ -0,0 +1,32 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Wed, 21 Nov 2018 12:24:42 +0300
+Subject: [PATCH] Fix CouchDB stopping in tests
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/test/couchdb/couchdb_auth_tests.erl b/test/couchdb/couchdb_auth_tests.erl
+index 1bd7d3fec..bfc04be87 100644
+--- a/test/couchdb/couchdb_auth_tests.erl
++++ b/test/couchdb/couchdb_auth_tests.erl
+@@ -17,12 +17,18 @@
+ 
+ 
+ start() ->
+-    couch_server_sup:start_link(?CONFIG_CHAIN),
+-    ok.
++    {ok, Pid} = couch_server_sup:start_link(?CONFIG_CHAIN),
++    Pid.
+ 
+ stop(_) ->
+     couch_server_sup:stop(),
+-    ok.
++    erlang:monitor(process, Pid),
++    receive
++        {'DOWN', _, _, Pid, _} ->
++            ok
++    after ?TIMEOUT ->
++        throw({timeout, server_stop})
++    end.
+ 
+ setup() ->
+     Addr = couch_config:get("httpd", "bind_address", "127.0.0.1"),
diff --git a/couchdb.spec b/couchdb.spec
index 2881978..fd48ed7 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -1,6 +1,6 @@
 Name:           couchdb
 Version:        1.7.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 License:        ASL 2.0
 URL:            https://couchdb.apache.org/
@@ -28,6 +28,7 @@ Patch16:	couchdb-0016-disable-tests-failing-on-ARM.patch
 Patch17:	couchdb-0017-Update-jiffy-to-use-dedupe_keys.patch
 Patch18:	couchdb-0018-Revert-disable-tests-failing-on-ARM.patch
 Patch19:	couchdb-0019-Increase-various-eunit-test-timeouts.patch
+Patch20:	couchdb-0020-Fix-CouchDB-stopping-in-tests.patch
 BuildRequires: autoconf
 BuildRequires: autoconf-archive
 BuildRequires: automake
@@ -165,6 +166,7 @@ exit 0
 
 
 %changelog
+* Wed Nov 21 2018 Peter Lemenkov <lemenkov@gmail.com> - 1.7.1-12
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild