diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index a0d1a08359..e7b8272023 100644
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -53,7 +53,7 @@ wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent);
 wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent);
 wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent);
 
-wxIMPLEMENT_CLASS(wxAuiNotebook, wxControl);
+wxIMPLEMENT_CLASS(wxAuiNotebook, wxBookCtrlBase);
 wxIMPLEMENT_CLASS(wxAuiTabCtrl, wxControl);
 wxIMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxBookCtrlEvent);
 
diff --git a/tests/controls/auitest.cpp b/tests/controls/auitest.cpp
index 0bf9b4d2a8..ef1a38321a 100644
--- a/tests/controls/auitest.cpp
+++ b/tests/controls/auitest.cpp
@@ -20,23 +20,38 @@
 #endif // WX_PRECOMP
 
 #include "wx/panel.h"
-#include "wx/scopedptr.h"
 
 #include "wx/aui/auibook.h"
 
 #include "asserthelper.h"
 
 // ----------------------------------------------------------------------------
-// test class
+// test fixtures
 // ----------------------------------------------------------------------------
 
-TEST_CASE( "wxAuiNotebook::DoGetBestSize", "[aui]" )
+class AuiNotebookTestCase
 {
-    wxWindow *frame = wxTheApp->GetTopWindow();
-    REQUIRE( frame );
-    wxAuiNotebook *nb = new wxAuiNotebook(frame);
-    wxScopedPtr<wxAuiNotebook> cleanUp(nb);
+public:
+    AuiNotebookTestCase()
+        : nb(new wxAuiNotebook(wxTheApp->GetTopWindow()))
+    {
+    }
 
+    ~AuiNotebookTestCase()
+    {
+        delete nb;
+    }
+
+protected:
+    wxAuiNotebook* const nb;
+};
+
+// ----------------------------------------------------------------------------
+// the tests themselves
+// ----------------------------------------------------------------------------
+
+TEST_CASE_METHOD(AuiNotebookTestCase, "wxAuiNotebook::DoGetBestSize", "[aui]")
+{
     wxPanel *p = new wxPanel(nb);
     p->SetMinSize(wxSize(100, 100));
     REQUIRE( nb->AddPage(p, "Center Pane") );
@@ -128,4 +143,12 @@ TEST_CASE( "wxAuiNotebook::DoGetBestSize", "[aui]" )
     }
 }
 
+TEST_CASE_METHOD(AuiNotebookTestCase, "wxAuiNotebook::RTTI", "[aui][rtti]")
+{
+    wxBookCtrlBase* const book = nb;
+    CHECK( wxDynamicCast(book, wxAuiNotebook) == nb );
+
+    CHECK( wxDynamicCast(nb, wxBookCtrlBase) == book );
+}
+
 #endif