diff --git a/framework/python/src/common/session.py b/framework/python/src/common/session.py
index 86d9dd90e..e6aa586f4 100644
--- a/framework/python/src/common/session.py
+++ b/framework/python/src/common/session.py
@@ -70,6 +70,13 @@ def get_finished(self):
     return self._finished
 
   def stop(self):
+    self.set_status('Stopping')
+
+    # Set any in progress test results to Error
+    for test_result in self._results:
+      if test_result.result == 'In Progress':
+        test_result.result = 'Error'
+
     self._finished = datetime.datetime.now()
 
   def _get_default_config(self):
diff --git a/framework/python/src/core/testrun.py b/framework/python/src/core/testrun.py
index f579eba26..2c62108ee 100644
--- a/framework/python/src/core/testrun.py
+++ b/framework/python/src/core/testrun.py
@@ -330,7 +330,7 @@ def stop(self):
     if self.get_net_orc().get_listener() is not None:
       self.get_net_orc().get_listener().stop_listener()
 
-    self.get_session().set_status('Stopping')
+    self.get_session().stop()
 
     self._stop_tests()
     self._stop_network(kill=True)