diff --git a/ui/webui/test/check-storage b/ui/webui/test/check-storage
index 9fd3ea8d970..350fd822750 100755
--- a/ui/webui/test/check-storage
+++ b/ui/webui/test/check-storage
@@ -179,16 +179,12 @@ class TestStorage(anacondalib.VirtInstallMachineCase):
         s.set_partitioning("use-free-space")
 
         i.next()
-        # Disk Encryption
+        # Disk Encryption / password screen
 
         encrypt = True
         s.set_encryption_selected(encrypt)
         s.check_encryption_selected(encrypt)
 
-        # Encryption password is on the same page
-        i.next(subpage=encrypt)
-        # Disk Encryption / password screen
-
         # Set valid password
         pw = "abcdefgh"
         s.set_password_confirm(pw)
diff --git a/ui/webui/test/end2end/storage_encryption.py b/ui/webui/test/end2end/storage_encryption.py
index e75441abd2d..703c163e765 100755
--- a/ui/webui/test/end2end/storage_encryption.py
+++ b/ui/webui/test/end2end/storage_encryption.py
@@ -38,8 +38,6 @@ def configure_storage_encryption(self):
         self._storage.set_encryption_selected(True)
         self._storage.check_encryption_selected(True)
 
-        self._installer.next(subpage=True)
-
         self._storage.set_password(self.luks_pass)
         self._storage.check_password(self.luks_pass)
         self._storage.set_password_confirm(self.luks_pass)
diff --git a/ui/webui/test/helpers/installer.py b/ui/webui/test/helpers/installer.py
index 965efaa95dd..51c2a8903a2 100644
--- a/ui/webui/test/helpers/installer.py
+++ b/ui/webui/test/helpers/installer.py
@@ -74,7 +74,7 @@ def reach(self, target_page):
             self.next(next_page=next_page)
 
     @log_step()
-    def next(self, should_fail=False, subpage=False, next_page=""):
+    def next(self, should_fail=False, next_page=""):
         current_page = self.get_current_page()
         # If not explicitly specified, get the first item for next page from the steps dict
         if not next_page:
@@ -89,7 +89,7 @@ def next(self, should_fail=False, subpage=False, next_page=""):
             sleep(2)
 
         self.browser.click("button:contains(Next)")
-        expected_page = current_page if should_fail or subpage else next_page
+        expected_page = current_page if should_fail else next_page
         self.wait_current_page(expected_page)
         return expected_page
 
@@ -104,12 +104,12 @@ def check_next_disabled(self, disabled=True):
         self.browser.wait_visible(f"#installation-next-btn:not([aria-disabled={value}]")
 
     @log_step(snapshot_before=True)
-    def back(self, should_fail=False, subpage=False):
+    def back(self, should_fail=False):
         current_page = self.get_current_page()
 
         self.browser.click("button:contains(Back)")
 
-        if should_fail or subpage:
+        if should_fail:
             self.wait_current_page(current_page)
         else:
             prev = [k for k, v in self.steps._steps_jump.items() if current_page in v][0]