diff --git a/src/test_workflow/integ_test/service.py b/src/test_workflow/integ_test/service.py
index 3dacfe0cd8..bc19acc77b 100644
--- a/src/test_workflow/integ_test/service.py
+++ b/src/test_workflow/integ_test/service.py
@@ -64,8 +64,6 @@ def terminate(self) -> ServiceTerminationResult:
 
         self.return_code = self.process_handler.terminate()
 
-        self.uninstall()
-
         return ServiceTerminationResult(
             self.return_code,
             self.process_handler.stdout_data,
diff --git a/src/test_workflow/test_cluster.py b/src/test_workflow/test_cluster.py
index f30a6504ce..a9c6a3bd0f 100644
--- a/src/test_workflow/test_cluster.py
+++ b/src/test_workflow/test_cluster.py
@@ -93,6 +93,8 @@ def terminate(self) -> None:
 
         self.__save_test_result_data(self.termination_result)
 
+        self.service.uninstall()
+
     def __save_test_result_data(self, termination_result: ServiceTerminationResult) -> None:
         test_result_data = TestResultData(
             self.component_name,