diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php
index 0edc44d8b..1aed3d3f7 100644
--- a/PHPCI/Builder.php
+++ b/PHPCI/Builder.php
@@ -213,8 +213,6 @@ public function execute()
                 $this->build->setStatus(Build::STATUS_FAILED);
             }
 
-            // Complete stage plugins are always run
-            $this->pluginExecutor->executePlugins($this->config, 'complete');
 
             if ($success) {
                 $this->pluginExecutor->executePlugins($this->config, 'success');
@@ -236,6 +234,9 @@ public function execute()
         } catch (\Exception $ex) {
             $this->build->setStatus(Build::STATUS_FAILED);
             $this->buildLogger->logFailure(Lang::get('exception') . $ex->getMessage());
+        }finally{
+            // Complete stage plugins are always run
+            $this->pluginExecutor->executePlugins($this->config, 'complete');
         }