diff --git a/setup.cfg b/setup.cfg
index 9d151f6fc7..3a604a87fe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,6 +10,9 @@ exclude-dir=lms/envs
 # which shadows the xblock library (among other things)
 no-path-adjustment=1
 
+process-restartworker=1
+process-timeout=300
+
 # Uncomment the following lines to open pdb when a test fails
 #nocapture=1
 #pdb=1