diff --git a/gajim/gtk/assistant.py b/gajim/gtk/assistant.py
index 5416f91ebc107c70502b34a4d34b24b97bf14250..112f89b778abe64ad4e0a6d025fb829e584db198 100644
--- a/gajim/gtk/assistant.py
+++ b/gajim/gtk/assistant.py
@@ -105,6 +105,7 @@ def add_default_page(self, name):
 
         self._pages[name] = page
         self._ui.stack.add_named(page, name)
+        return page
 
     def get_current_page(self):
         return self._ui.stack.get_visible_child_name()
diff --git a/test/gtk/assistant.py b/test/gtk/assistant.py
index d988e87fae2be4e69d9804248e5a7067f7d10483..6d818e1fce110792c21b8e06b7a7072c960df26c 100644
--- a/test/gtk/assistant.py
+++ b/test/gtk/assistant.py
@@ -17,18 +17,15 @@ def __init__(self):
         self.add_pages({'start': Start(),
                         'progress': Progress()})
 
-        self.add_default_page('error')
-        self.add_default_page('success')
-
-        success_page = self.get_page('success')
-        success_page.set_title('Success')
-        success_page.set_heading('Success Heading')
-        success_page.set_text('This is the success text')
-
-        error_page = self.get_page('error')
-        error_page.set_title('Error')
-        error_page.set_heading('Error Heading')
-        error_page.set_text('This is the error text')
+        error = self.add_default_page('error')
+        error.set_title('Error')
+        error.set_heading('Error Heading')
+        error.set_text('This is the error text')
+
+        success = self.add_default_page('success')
+        success.set_title('Success')
+        success.set_heading('Success Heading')
+        success.set_text('This is the success text')
 
         self.add_button('forward', 'Forward', 'suggested-action')
         self.add_button('close', 'Close', 'destructive-action')