diff --git a/setup.cfg b/setup.cfg
index b87bd9cc..f953f5d3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -63,7 +63,7 @@ test =
   testtools>=1.4.0 # MIT
   coverage>=3.6 # Apache-2.0
   fixtures>=3.0.0 # Apache-2.0/BSD
-  pifpaf>=0.4.0 # Apache-2.0
+  pifpaf>=0.10.0 # Apache-2.0
 doc =
   sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
   oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d5261fb6..806e5b96 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,9 +63,11 @@ commands = pifpaf -e TOOZ_TEST run mysql -- python setup.py testr --slowest --te
 
 [testenv:py27-etcd]
 commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd --  python setup.py testr --slowest --testr-args="{posargs}"
+           {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd --cluster --  python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:py35-etcd]
 commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- python setup.py testr --slowest --testr-args="{posargs}"
+           {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd --cluster -- python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:py27-consul]
 commands = {toxinidir}/setup-consul-env.sh pifpaf -g TOOZ_TEST run consul -- python setup.py testr --slowest --testr-args="{posargs}"