diff --git a/lib/ceedling/loginator.rb b/lib/ceedling/loginator.rb
index 5b635d32..8588160d 100644
--- a/lib/ceedling/loginator.rb
+++ b/lib/ceedling/loginator.rb
@@ -17,6 +17,7 @@ class Loginator
   constructor :verbosinator, :file_wrapper, :system_wrapper
 
   def setup()
+    $loginator = self
     @decorators = false
 
     # Friendly robustification for certain testing scenarios
@@ -311,5 +312,5 @@ def logfile(string, stream='')
 end
 
 END {
-  @ceedling[:loginator].wrapup
+  $loginator.wrapup unless $loginator.nil?
 }
\ No newline at end of file