diff --git a/CHANGELOG.md b/CHANGELOG.md
index 681b4fe..6af0df5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,15 @@
 
 ## [Unreleased][]
 
-[Unreleased]: https://github.com/chaostoolkit/chaostoolkit-addons/compare/0.8.1...HEAD
+[Unreleased]: https://github.com/chaostoolkit/chaostoolkit-addons/compare/0.8.2...HEAD
+
+## [0.8.2][]
+
+[0.8.2]: https://github.com/chaostoolkit/chaostoolkit-addons/compare/0.8.1...0.8.2
+
+### Changed
+
+- Indirection to the exeit function so we can override in tests
 
 ## [0.8.1][]
 
diff --git a/chaosaddons/controls/safeguards.py b/chaosaddons/controls/safeguards.py
index 8798f1b..95303f8 100644
--- a/chaosaddons/controls/safeguards.py
+++ b/chaosaddons/controls/safeguards.py
@@ -209,7 +209,10 @@ def _wait_interruption(self) -> None:
                 logger.critical(
                     "Safeguard '{}' triggered the end of the experiment".format(
                         self.triggered_by))
-                exit_gracefully()
+                self._exit()
+
+    def _exit(self) -> None:
+        exit_gracefully()
 
     def _log_finished(self, f: Future, probe: Probe) -> None:
         """