diff --git a/auto-notify.plugin.zsh b/auto-notify.plugin.zsh
index 0944e38..be07099 100644
--- a/auto-notify.plugin.zsh
+++ b/auto-notify.plugin.zsh
@@ -86,11 +86,10 @@ function disable_auto_notify() {
 }
 
 function enable_auto_notify() {
+    autoload -Uz add-zsh-hook
     add-zsh-hook preexec _auto_notify_track
     add-zsh-hook precmd _auto_notify_send
 }
 
-autoload -Uz add-zsh-hook
-
 _auto_notify_reset_tracking
 enable_auto_notify
diff --git a/tests/test_auto_notify.zunit b/tests/test_plugin.zunit
similarity index 100%
rename from tests/test_auto_notify.zunit
rename to tests/test_plugin.zunit