diff --git a/tools/run-pifpaf-tests.sh b/tools/run-pifpaf-tests.sh
index ee21c699..072975cb 100755
--- a/tools/run-pifpaf-tests.sh
+++ b/tools/run-pifpaf-tests.sh
@@ -3,5 +3,5 @@ set -e
 # Replace mysql:// by mysql+pymysql:// and add sqlite
 export OS_TEST_DBAPI_ADMIN_CONNECTION="${OS_TEST_DBAPI_ADMIN_CONNECTION/#mysql:/mysql+pymysql:};sqlite://"
 echo $OS_TEST_DBAPI_ADMIN_CONNECTION
-stestr run $*
-TEST_EVENTLET=1 stestr run $*
+TEST_EVENTLET=0 stestr run $*
+TEST_EVENTLET=1 stestr run --combine $*
diff --git a/tox.ini b/tox.ini
index 3cf52ad3..254f6932 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,7 @@ deps =
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 commands =
-  env TEST_EVENTLET=0 {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs}
-  env TEST_EVENTLET=1 {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs}
+  {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs}
 
 [testenv:pep8]
 commands =