diff --git a/event_test.go b/event_test.go
index b1445a19..26c407d3 100644
--- a/event_test.go
+++ b/event_test.go
@@ -84,9 +84,9 @@ func TestUnmarshalEvent(t *testing.T) {
 
 func TestUnmarshalEvents(t *testing.T) {
 	origRegisteredEvents := registeredEvents
-	defer func() {
+	t.Cleanup(func() {
 		registeredEvents = origRegisteredEvents
-	}()
+	})
 	registeredEvents = make(map[string]Event)
 
 	RegisterEvent(dummyEvent{})