diff --git a/Lib/fontTools/varLib/interpolatable.py b/Lib/fontTools/varLib/interpolatable.py
index f03e94620..da5598112 100644
--- a/Lib/fontTools/varLib/interpolatable.py
+++ b/Lib/fontTools/varLib/interpolatable.py
@@ -282,14 +282,8 @@ def test_gen(
             # "contour_order" check
             #
 
-            matching, matching_cost, identity_cost = test_contour_order(glyph0, glyph1)
-            if matching_cost < identity_cost * tolerance:
-                log.debug(
-                    "matching_ratio %g",
-                    matching_cost / identity_cost,
-                )
-                this_tolerance = matching_cost / identity_cost
-                log.debug("tolerance: %g", this_tolerance)
+            this_tolerance, matching = test_contour_order(glyph0, glyph1)
+            if this_tolerance < tolerance:
                 yield (
                     glyph_name,
                     {
@@ -352,14 +346,12 @@ def test_gen(
                     # after reordering above.
                     continue
 
-                proposed_point, reverse, min_cost, first_cost = test_starting_point(
+                this_tolerance, proposed_point, reverse = test_starting_point(
                     glyph0, glyph1, ix, tolerance, matching
                 )
 
                 if proposed_point or reverse:
-                    this_tolerance = min_cost / first_cost
-                    log.debug("tolerance: %g", this_tolerance)
-                    if min_cost < first_cost * tolerance:
+                    if this_tolerance < tolerance:
                         yield (
                             glyph_name,
                             {
@@ -381,7 +373,7 @@ def test_gen(
                     # If contour could be mid-interpolated, and the two
                     # contours have the same area sign, proceeed.
                     #
-                    # The sign difference can happen if it's a werido
+                    # The sign difference can happen if it's a weirdo
                     # self-intersecting contour; ignore it.
                     contour = midRecording[ix]
 
diff --git a/Lib/fontTools/varLib/interpolatableTestContourOrder.py b/Lib/fontTools/varLib/interpolatableTestContourOrder.py
index d089e4357..9edb1afcb 100644
--- a/Lib/fontTools/varLib/interpolatableTestContourOrder.py
+++ b/Lib/fontTools/varLib/interpolatableTestContourOrder.py
@@ -1,4 +1,7 @@
 from .interpolatableHelpers import *
+import logging
+
+log = logging.getLogger("fontTools.varLib.interpolatable")
 
 
 def test_contour_order(glyph0, glyph1):
@@ -71,4 +74,9 @@ def test_contour_order(glyph0, glyph1):
                 matching_cost = matching_cost_green
                 identity_cost = identity_cost_green
 
-    return matching, matching_cost, identity_cost
+    this_tolerance = matching_cost / identity_cost if identity_cost else 1
+    log.debug(
+        "test-contour-order: tolerance %g",
+        this_tolerance,
+    )
+    return this_tolerance, matching
diff --git a/Lib/fontTools/varLib/interpolatableTestStartingPoint.py b/Lib/fontTools/varLib/interpolatableTestStartingPoint.py
index 9f742a14f..18a0db4f3 100644
--- a/Lib/fontTools/varLib/interpolatableTestStartingPoint.py
+++ b/Lib/fontTools/varLib/interpolatableTestStartingPoint.py
@@ -102,4 +102,9 @@ def test_starting_point(glyph0, glyph1, ix, tolerance, matching):
                 # proposed_point = 0  # new_contour1[min_cost_idx][1]
                 pass
 
-    return proposed_point, reverse, min_cost, first_cost
+    this_tolerance = min_cost / first_cost if first_cost else 1
+    log.debug(
+        "test-starting-point: tolerance %g",
+        this_tolerance,
+    )
+    return this_tolerance, proposed_point, reverse