diff --git a/easybuild/easyblocks/l/llvm.py b/easybuild/easyblocks/l/llvm.py
index 4512fdc8725..2143c1d32f2 100644
--- a/easybuild/easyblocks/l/llvm.py
+++ b/easybuild/easyblocks/l/llvm.py
@@ -349,6 +349,10 @@ def __init__(self, *args, **kwargs):
         if self.cfg['build_bolt']:
             self.final_projects.append('bolt')
 
+        # Fix for https://github.com/easybuilders/easybuild-easyblocks/issues/3689
+        if LooseVersion(self.version) < LooseVersion('16'):
+            general_opts['LLVM_INCLUDE_GO_TESTS'] = 'OFF'
+
         # Sysroot
         sysroot = build_option('sysroot')
         if sysroot: