diff --git a/scripts/format-code.sh b/scripts/format-code.sh
index 2132317..0000189 100755
--- a/scripts/format-code.sh
+++ b/scripts/format-code.sh
@@ -245,9 +245,12 @@
 
 # Sometimes your situation is terrible enough that you need the flexibility.
 # For example, phosphor-mboxd.
-if [[ -f "format-code.sh" ]]; then
-    ./format-code.sh
-    if [ -z "$OPTION_NO_DIFF" ]; then
-        git --no-pager diff --exit-code
+for formatter in "format-code.sh" "format-code"; do
+    if [[ -x "${formatter}" ]]; then
+        echo -e "    ${BLUE}Calling secondary formatter:${NORMAL} ${formatter}"
+        "./${formatter}"
+        if [ -z "$OPTION_NO_DIFF" ]; then
+            git --no-pager diff --exit-code
+        fi
     fi
-fi
+done
diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index c112b97..daae582 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -1197,19 +1197,11 @@
 
     CODE_SCAN_DIR = os.path.join(WORKSPACE, UNIT_TEST_PKG)
 
-    # First validate code formatting if repo has style formatting files.
-    # The format-code.sh checks for these files.
+    # Run format-code.sh, which will in turn call any repo-level formatters.
     if FORMAT_CODE:
-        format_scripts = find_file(['format-code.sh', 'format-code'],
-                                   CODE_SCAN_DIR)
-
-        # use default format-code.sh if no other found
-        if not format_scripts:
-            format_scripts.append(os.path.join(WORKSPACE, "openbmc-build-scripts",
-                                               "scripts", "format-code.sh"))
-
-        for f in format_scripts:
-            check_call_cmd(f, CODE_SCAN_DIR)
+        check_call_cmd(os.path.join(WORKSPACE, "openbmc-build-scripts",
+                                    "scripts", "format-code.sh"),
+                       CODE_SCAN_DIR)
 
         # Check to see if any files changed
         check_call_cmd("git", "-C", CODE_SCAN_DIR,