diff --git a/dev_requirements.txt b/dev_requirements.txt
index 0b2846ac..f48006e5 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -5,6 +5,7 @@ mock==2.0.0
 pytz==2018.5
 cffi==1.11.2  # Random pin to try and fix pyparser==2.18 not having effect
 pycparser==2.18  # Last version supporting 2.6.
+faulthandler==3.1; python_version < '3.3'  # used by testlib
 pytest-catchlog==1.2.2
 pytest==3.1.2
 PyYAML==3.11; python_version < '2.7'
diff --git a/tests/testlib.py b/tests/testlib.py
index f2bad491..8f11337d 100644
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -14,6 +14,11 @@ import mitogen.core
 import mitogen.master
 import mitogen.utils
 
+try:
+    import faulthandler
+except ImportError:
+    pass
+
 try:
     import urlparse
 except ImportError:
@@ -32,6 +37,9 @@ sys.path.append(DATA_DIR)
 if mitogen.is_master:
     mitogen.utils.log_to_file()
 
+if faulthandler is not None:
+    faulthandler.enable()
+
 
 def data_path(suffix):
     path = os.path.join(DATA_DIR, suffix)