diff --git a/e2e/test_enroll_2_step.py b/e2e/test_enroll_2_step.py
index e4e7dbd0f..d7b4e312f 100644
--- a/e2e/test_enroll_2_step.py
+++ b/e2e/test_enroll_2_step.py
@@ -299,7 +299,6 @@ class TestEnroll2Step(SeleniumTestCase):
         self.driver.find_element(By.CSS_SELECTOR, ".pf-c-button").click()
         self.driver.find_element(By.LINK_TEXT, "foo").click()
 
-        self.wait.until(ec.presence_of_element_located((By.ID, "id_username")))
         self.assertEqual(
             self.driver.find_element(By.XPATH, "//a[contains(@href, '/-/user/')]").text,
             "foo",
diff --git a/e2e/utils.py b/e2e/utils.py
index 4b74176b4..fa6876796 100644
--- a/e2e/utils.py
+++ b/e2e/utils.py
@@ -56,7 +56,7 @@ class SeleniumTestCase(StaticLiveServerTestCase):
         )
 
     def tearDown(self):
-        self.driver.save_screenshot(f"out/{time()}.png")
+        self.driver.save_screenshot(f"out/{self.__class__.__name__}_{time()}.png")
         self.driver.quit()
         super().tearDown()