diff --git a/js/app.mozbuild b/js/app.mozbuild
index ccc73c699d87c..3f0876a2f9dd2 100644
--- a/js/app.mozbuild
+++ b/js/app.mozbuild
@@ -13,6 +13,11 @@ else:
         '/js/src/tests',
     ]
 
+if CONFIG['JS_STANDALONE'] and CONFIG['OS_ARCH'] != 'WINNT':
+    DIRS += [
+        '/build/unix',
+    ]
+
 DIRS += [
     '/config/external/fdlibm',
     '/config/external/nspr',
diff --git a/js/src/devtools/automation/autospider.py b/js/src/devtools/automation/autospider.py
index 6b5d621855319..3c4f2325d7157 100755
--- a/js/src/devtools/automation/autospider.py
+++ b/js/src/devtools/automation/autospider.py
@@ -230,6 +230,10 @@ def ensure_dir_exists(name, clobber=True, creation_marker_filename="CREATED-BY-A
     env.setdefault('CC', compiler)
     env.setdefault('CXX', cxx)
 
+bindir = os.path.join(OBJDIR, 'dist', 'bin')
+env['LD_LIBRARY_PATH'] = ':'.join(
+    p for p in (bindir, env.get('LD_LIBRARY_PATH')) if p)
+
 rust_dir = os.path.join(DIR.tooltool, 'rustc')
 if os.path.exists(os.path.join(rust_dir, 'bin', 'rustc')):
     env.setdefault('RUSTC', os.path.join(rust_dir, 'bin', 'rustc'))
diff --git a/js/src/devtools/rootAnalysis/analyze.py b/js/src/devtools/rootAnalysis/analyze.py
index c9cf32d2d1f2d..de14aeef5750a 100755
--- a/js/src/devtools/rootAnalysis/analyze.py
+++ b/js/src/devtools/rootAnalysis/analyze.py
@@ -32,6 +32,8 @@ def env(config):
     e['XDB'] = '%(sixgill_bin)s/xdb.so' % config
     e['SOURCE'] = config['source']
     e['ANALYZED_OBJDIR'] = config['objdir']
+    bindir = os.path.dirname(config['js'])
+    e['LD_LIBRARY_PATH'] = ':'.join(p for p in (e.get('LD_LIBRARY_PATH'), bindir) if p)
     return e
 
 def fill(command, config):