diff --git a/debian/changelog b/debian/changelog
index 2fa4815..c78f088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 patroni (1.5.4-6) UNRELEASED; urgency=medium
 
-  * 
+  [ Michael Banck ]
+  * debian/tests/acceptance: Fix DCS check for zookeeper in case etcd-server is
+    installed as well.
 
  -- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>  Mon, 04 Feb 2019 12:15:43 +0100
 
diff --git a/debian/tests/acceptance b/debian/tests/acceptance
index 4d7d643..6d931f6 100755
--- a/debian/tests/acceptance
+++ b/debian/tests/acceptance
@@ -15,7 +15,7 @@ then
         SU='su postgres -p -c'
 
         # zookeeper must be started manually (as root)
-        if ! [ -x /usr/bin/etcd ] && [ -x /etc/init.d/zookeeper ]; then
+        if [ "$DCS" = "zookeeper" ]; then
                 # JAVA_OPTS need to be set, otherwise zookeeper is not reachable via IPV4
                 sed -i -e 's/#JAVA_OPTS=""/JAVA_OPTS="-Djava.net.preferIPv4Stack=true"/' /etc/default/zookeeper
                 /etc/init.d/zookeeper start