diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/src/main/java/org/xwiki/appwithinminutes/test/po/ApplicationCreatePage.java b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/src/main/java/org/xwiki/appwithinminutes/test/po/ApplicationCreatePage.java
index ab8df0be9f9ce1269eb0a328adbf33c414472d5c..4b2d697327d502acf0623ce40337ac449c22a07f 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/src/main/java/org/xwiki/appwithinminutes/test/po/ApplicationCreatePage.java
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/src/main/java/org/xwiki/appwithinminutes/test/po/ApplicationCreatePage.java
@@ -138,7 +138,13 @@ public DocumentPicker getLocationPicker()
      */
     public ApplicationClassEditPage clickNextStep()
     {
+        // Make sure we actually wait for the page load to complete before returning.
+        getDriver().addPageNotYetReloadedMarker();
+
         clickNextStepButton();
+
+        getDriver().waitUntilPageIsReloaded();
+
         return new ApplicationClassEditPage();
     }