diff -Nru patroni-1.6.4/debian/changelog patroni-1.6.4/debian/changelog
--- patroni-1.6.4/debian/changelog	2020-03-28 09:19:53.000000000 +0000
+++ patroni-1.6.4/debian/changelog	2020-03-30 07:28:32.000000000 +0000
@@ -1,3 +1,12 @@
+patroni (1.6.4-2ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Mark new consul/zookeper tests as flaky too
+    - Disable etcd test, not working everywhere
+      See Debian bugs: #952536, #952535
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 30 Mar 2020 09:28:32 +0200
+
 patroni (1.6.4-2) unstable; urgency=medium
 
   * debian/pg_clonecluster_patroni: quote connstr in pg_createcluster
@@ -13,6 +22,19 @@
 
  -- Michael Banck <michael.banck@credativ.de>  Sat, 28 Mar 2020 10:19:53 +0100
 
+patroni (1.6.4-1ubuntu3) focal; urgency=medium
+
+  * Mark new consul/zookeper tests as flaky too  
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 03 Mar 2020 13:09:39 +0100
+
+patroni (1.6.4-1ubuntu2) focal; urgency=medium
+
+  * Disable etcd test, not working everywhere
+    See Debian bugs: #952536, #952535
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 25 Feb 2020 13:49:20 +0100
+
 patroni (1.6.4-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru patroni-1.6.4/debian/tests/control patroni-1.6.4/debian/tests/control
--- patroni-1.6.4/debian/tests/control	2020-03-05 17:59:14.000000000 +0000
+++ patroni-1.6.4/debian/tests/control	2020-03-29 11:07:45.000000000 +0000
@@ -7,18 +7,18 @@
  python3-coverage,
  @,
 Test-Command: debian/tests/acceptance consul
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 
 # etcd
-Depends:
- etcd-server,
- postgresql,
- python3-behave,
- python3-coverage,
- python3-etcd (>= 0.4.3),
- @,
-Test-Command: debian/tests/acceptance etcd
-Restrictions: allow-stderr
+#Depends:
+# etcd-server,
+# postgresql,
+# python3-behave,
+# python3-coverage,
+# python3-etcd (>= 0.4.3),
+# @,
+#Test-Command: debian/tests/acceptance etcd
+#Restrictions: allow-stderr
 
 # zookeper
 Depends:
@@ -29,7 +29,7 @@
  python3-kazoo,
  @,
 Test-Command: debian/tests/acceptance zookeeper
-Restrictions: needs-root, allow-stderr
+Restrictions: needs-root, allow-stderr, flaky
 
 # regression tests
 Depends: