diff --git a/tests/controls/textentrytest.cpp b/tests/controls/textentrytest.cpp
index 588e61bc72..19b41ff406 100644
--- a/tests/controls/textentrytest.cpp
+++ b/tests/controls/textentrytest.cpp
@@ -183,8 +183,14 @@ class TextEventHandler
 {
 public:
     explicit TextEventHandler(wxWindow* win)
+        : m_win(win)
     {
-        win->Bind(wxEVT_TEXT, &TextEventHandler::OnText, this);
+        m_win->Bind(wxEVT_TEXT, &TextEventHandler::OnText, this);
+    }
+
+    ~TextEventHandler()
+    {
+        m_win->Unbind(wxEVT_TEXT, &TextEventHandler::OnText, this);
     }
 
     const wxString& GetLastString() const
@@ -198,6 +204,8 @@ private:
         m_string = event.GetString();
     }
 
+    wxWindow* const m_win;
+
     wxString m_string;
 };