diff --git a/test/problems b/test/problems
index 1b3709f54..2e738a0c0 100755
--- a/test/problems
+++ b/test/problems
@@ -56,7 +56,7 @@ if __name__ == "__main__":
     timestamp = re.compile("^# (\d+(?:\.\d+)?) ==>.*$")
 
     expected_fail = re.compile(r"^not ok.*?#\s*TODO", re.I)
-    unexpected_pass = re.compile(r"^ok .*?#\s*TODO", re.I)
+    unexpected_pass = re.compile(r"^not ok .*?#\s*FIXED", re.I)
     skip = re.compile(r"^ok .*?#\s*skip", re.I)
     ok = re.compile(r"^ok ", re.I)
     not_ok = re.compile(r"^not ok", re.I)
diff --git a/test/simpletap/__init__.py b/test/simpletap/__init__.py
index f5d3a5cf9..6c51df6e3 100644
--- a/test/simpletap/__init__.py
+++ b/test/simpletap/__init__.py
@@ -162,6 +162,10 @@ class TAPTestResult(unittest.result.TestResult):
                 self.stream.writeln("{0} {1} - {2}: {3} # TODO".format(
                     color("not ok", "yellow"), self.testsRun, filename, desc)
                 )
+            elif status == "UNEXPECTED_SUCCESS":
+                self.stream.writeln("{0} {1} - {2}: {3} # FIXED".format(
+                    color("not ok", "yellow"), self.testsRun, filename, desc)
+                )
             else:
                 self.stream.writeln("{0} {1} - {2}: {3}".format(
                     color("not ok", "red"), self.testsRun, filename, desc)