diff --git a/mistral/cmd/launch.py b/mistral/cmd/launch.py
index ebff6d218..8df325b1c 100644
--- a/mistral/cmd/launch.py
+++ b/mistral/cmd/launch.py
@@ -25,6 +25,12 @@ eventlet.monkey_patch(
     socket=True,
     thread=False if '--use-debugger' in sys.argv else True,
     time=True)
+# Monkey patch the original current_thread to use the up-to-date _active
+# global variable. See https://bugs.launchpad.net/bugs/1863021 and
+# https://github.com/eventlet/eventlet/issues/592
+import __original_module_threading as orig_threading
+import threading  # noqa
+orig_threading.current_thread.__globals__['_active'] = threading._active
 
 
 import os
diff --git a/tox.ini b/tox.ini
index e87e0e35f..71f50719f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,7 +39,7 @@ commands = ./run_tests.sh -N --db-type mysql
 [testenv:pep8]
 commands =
   doc8 doc/source
-  flake8 {posargs} . {toxinidir}/tools/get_action_list.py {toxinidir}/tools/sync_db.py
+  flake8 {posargs} . {toxinidir}/tools/sync_db.py
 
 [testenv:cover]
 setenv =