diff --git a/run_desktop_tests.py b/run_desktop_tests.py
index 45f75c7e67..b94c31d074 100755
--- a/run_desktop_tests.py
+++ b/run_desktop_tests.py
@@ -166,9 +166,6 @@ def main():
 
     print_pretty("not found", not_found)
 
-    if len(results["failed"]) > 0:
-        exit(1)
-
 
 if (__name__ == "__main__"):
     main()
diff --git a/testing/testingmain.cpp b/testing/testingmain.cpp
index 8c2943cd27..931a1ce49a 100644
--- a/testing/testingmain.cpp
+++ b/testing/testingmain.cpp
@@ -93,12 +93,12 @@ int main(int argc, char * argv[])
       return 5;
     }
 
+    my::HighResTimer timer(true);
+
     try
     {
-      my::HighResTimer timer(true);
       // Run the test.
       pTest->m_Fn();
-      uint64_t const elapsed = timer.ElapsedNano();
 
       if (g_bLastTestOK)
       {
@@ -111,7 +111,6 @@ int main(int argc, char * argv[])
         testResults[iTest] = false;
         ++numFailedTests;
       }
-      LOG(LINFO, ("Test took", elapsed, "ns"));
 
     }
     catch (TestFailureException const & )
@@ -132,6 +131,9 @@ int main(int argc, char * argv[])
       ++numFailedTests;
     }
     g_bLastTestOK = true;
+
+    uint64_t const elapsed = timer.ElapsedNano();
+    LOG(LINFO, ("Test took", elapsed / 1000000, "ms"));
   }
 
   if (numFailedTests == 0)
diff --git a/testlog_to_xml_converter.py b/testlog_to_xml_converter.py
index f1077c3fb6..616984a536 100755
--- a/testlog_to_xml_converter.py
+++ b/testlog_to_xml_converter.py
@@ -56,8 +56,8 @@ class TestInfo:
             ElementTree.SubElement(d, "failure")
         return d
 
-    def set_duration(self, nanos):
-        self.test_duration = float(nanos) / 1000000000
+    def set_duration(self, milis):
+        self.test_duration = float(milis) 
 
 
 class Parser:
@@ -87,7 +87,7 @@ class Parser:
 
                         test_info = None
 
-                elif line == "OK" or line == "FAILED":
+                elif line == "OK" or line.startswith("FAILED"):
                     if test_info is not None:
                         test_info.test_result = line