Index: lnt/server/db/testsuitedb.py
===================================================================
--- lnt/server/db/testsuitedb.py
+++ lnt/server/db/testsuitedb.py
@@ -1045,7 +1045,7 @@
                     continue
                 field = field_dict.get(key)
                 if field is None and key != 'profile':
-                    raise ValueError("test %r: Metric %r unknown in suite " %
+                    raise ValueError("test %s: Metric '%s' unknown in suite " %
                                      (name, key))
 
                 if not isinstance(values, list):
Index: tests/server/db/yamlschema.shtest
===================================================================
--- tests/server/db/yamlschema.shtest
+++ tests/server/db/yamlschema.shtest
@@ -20,7 +20,7 @@
 #
 # Inserting with an extra field shouldn't work just yet
 # RUN: not lnt import "%t.install" -s my_suite "%S/Inputs/customschema-report2.json" 2>&1 | FileCheck %s --check-prefix=NOTUPGRADED
-# NOTUPGRADED: Metric u'newfield' unknown in suite
+# NOTUPGRADED: Metric 'newfield' unknown in suite
 
 # Upgrading to a schema with metrics/fields removed should fail
 # RUN: rm -f "%t.install/schemas/my_suite.yaml"