diff --git a/ansi/test-raw.rkt b/ansi/test-raw.rkt
index e4355e6..23fb6fe 100644
--- a/ansi/test-raw.rkt
+++ b/ansi/test-raw.rkt
@@ -9,10 +9,9 @@
 (define (main)
   (tty-raw!)
 
-  (define old-exit-handler (exit-handler))
-  (exit-handler (lambda (v)
-		  (display (reset-mode x11-any-event-mouse-tracking-mode))
-		  (old-exit-handler v)))
+  (plumber-add-flush! (current-plumber)
+                      (lambda (handle)
+                        (display (reset-mode x11-any-event-mouse-tracking-mode))))
 
   (for-each display (list (set-mode x11-any-event-mouse-tracking-mode)))