diff --git a/src/plugins/autotest/testoutputreader.h b/src/plugins/autotest/testoutputreader.h
index f615f5a2056..e102131e6c1 100644
--- a/src/plugins/autotest/testoutputreader.h
+++ b/src/plugins/autotest/testoutputreader.h
@@ -25,8 +25,7 @@ public:
     int disabledTests() const { return m_disabled; }
     bool hasSummary() const { return !m_summary.isEmpty(); }
     QHash<ResultType, int> summary() const { return m_summary; }
-    bool hasDuration() const { return m_executionDuration.has_value(); }
-    int duration() const { return m_executionDuration.value(); }
+    std::optional<int> duration() const { return m_executionDuration; }
     void setId(const QString &id) { m_id = id; }
     QString id() const { return m_id; }
 
diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
index f794e45eef4..b92d503b4fb 100644
--- a/src/plugins/autotest/testrunner.cpp
+++ b/src/plugins/autotest/testrunner.cpp
@@ -454,8 +454,8 @@ void TestRunner::runTestsHelper()
                 emit hadDisabledTests(disabled);
             if (testStorage->m_outputReader->hasSummary())
                 emit reportSummary(testStorage->m_outputReader->id(), testStorage->m_outputReader->summary());
-            if (testStorage->m_outputReader->hasDuration())
-                emit reportDuration(testStorage->m_outputReader->duration());
+            emit reportDuration(testStorage->m_outputReader->duration().value_or(
+                process.processDuration().count()));
 
             testStorage->m_outputReader->resetCommandlineColor();
         }