diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py
index 3218c73..2bcd421 100644
--- a/lldb/packages/Python/lldbsuite/test/configuration.py
+++ b/lldb/packages/Python/lldbsuite/test/configuration.py
@@ -27,7 +27,7 @@
     from . import crashinfo
     crashinfo.setCrashReporterDescription(text)
 
-def __setupCrashInfoHook():
+def setupCrashInfoHook():
     if platform.system() == "Darwin":
         from . import lock
         test_dir = os.environ['LLDB_TEST']
@@ -48,7 +48,7 @@
             compile_lock.release()
             del compile_lock
 
-        setCrashInfoHook = setCrashInfoHook_Mac
+        setCrashInfoHook = __setCrashInfoHook_Mac
 
     else:
         pass
@@ -220,7 +220,6 @@
 
 # safe default
 setCrashInfoHook = lambda x : None
-__setupCrashInfoHook()
 
 def shouldSkipBecauseOfCategories(test_categories):
     if useCategories:
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 318f2d2..e0535c3 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -1086,6 +1086,7 @@
         signal.signal(signal.SIGINT, signal.SIG_IGN)
 
     setupSysPath()
+    configuration.setupCrashInfoHook()
 
     #
     # If '-l' is specified, do not skip the long running tests.