diff --git a/build/bin/sage-site b/build/bin/sage-site
index 44d8e3acff9..ef5762d3cdc 100755
--- a/build/bin/sage-site
+++ b/build/bin/sage-site
@@ -157,6 +157,13 @@ if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
     # cause the build to hang. If stdin is /dev/null, TeX just aborts.
     shift
     export LANG=C # to ensure it is possible to scrape out non-EN locale warnings
+
+    # See #30351: bugs in macOS implementations of openblas/libgopm can cause
+    # docbuild to hang if multiple OpenMP threads are allowed.
+    if [ `uname` = 'Darwin' ]; then
+        export OMP_NUM_THREADS=1
+    fi
+
     exec sage-python -m sage_setup.docbuild "$@" </dev/null
 fi
 
diff --git a/src/bin/sage-runtests b/src/bin/sage-runtests
index 32d3fddc778..be4e52f5701 100755
--- a/src/bin/sage-runtests
+++ b/src/bin/sage-runtests
@@ -168,10 +168,13 @@ if __name__ == "__main__":
                     # cause us to run out of physical memory, leading to system
                     # instability (as opposed to virtual memory allocs failing)
                     options.memlimit = -1
-
     # Limit the number of threads to 2 to save system resources.
-    # See Trac #23713 and #23892
-    os.environ["OMP_NUM_THREADS"] = "2"
+    # See Trac #23713, #23892, #30351
+    if sys.platform == 'darwin':  
+        os.environ["OMP_NUM_THREADS"] = "1"
+    else:
+        os.environ["OMP_NUM_THREADS"] = "2"
+
     os.environ["SAGE_NUM_THREADS"] = "2"
 
     from sage.doctest.control import DocTestController
diff --git a/src/sage_setup/docbuild/utils.py b/src/sage_setup/docbuild/utils.py
index d523573a89e..bc8431208d1 100644
--- a/src/sage_setup/docbuild/utils.py
+++ b/src/sage_setup/docbuild/utils.py
@@ -112,13 +112,13 @@ def build_many(target, args, processes=None):
         ...
         WorkerDiedException: worker for 4 died with non-zero exit code -9
     """
-    import multiprocessing
+    from multiprocessing import Process, Queue, cpu_count, set_start_method
     # With OS X, Python 3.8 defaults to use 'spawn' instead of 'fork'
     # in multiprocessing, and Sage docbuilding doesn't work with
     # 'spawn'. See trac #27754.
     if os.uname().sysname == 'Darwin':
-        multiprocessing.set_start_method('fork', force=True)
-    from six.moves.queue import Empty
+        set_start_method('fork', force=True)
+    from queue import Empty
 
     if processes is None:
         processes = multiprocessing.cpu_count()