Index: utils/update_test_checks.py
===================================================================
--- utils/update_test_checks.py
+++ utils/update_test_checks.py
@@ -68,9 +68,10 @@
   autogenerated_note = (ADVERT + 'utils/' + os.path.basename(__file__))
 
   opt_basename = os.path.basename(args.opt_binary)
-  if (opt_basename != "opt"):
+  if (opt_basename != "opt" and opt_basename[0:4] != "opt-"):
     print('ERROR: Unexpected opt name: ' + opt_basename, file=sys.stderr)
     sys.exit(1)
+  opt_basename = "opt"
 
   test_paths = [test for pattern in args.tests for test in glob.glob(pattern)]
   for test in test_paths: