diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 8f28ee0..1b3d1f5 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -1062,7 +1062,10 @@
         # Run clang-tidy only if the project has a configuration
         if os.path.isfile(".clang-tidy"):
             os.environ["CC"] = "clang"
-            os.environ["CXX"] = "clang++"
+            # Clang-20 currently has some issue with libstdcpp's
+            # std::forward_like which results in a bunch of compile errors.
+            # Adding -fno-builtin-std-forward_like causes them to go away.
+            os.environ["CXX"] = "clang++ -fno-builtin-std-forward_like"
             with TemporaryDirectory(prefix="build", dir=".") as build_dir:
                 check_call_cmd("meson", "setup", build_dir)
                 if not os.path.isfile(".openbmc-no-clang"):