diff --git a/frontend_tests/casper_tests/10-admin.js b/frontend_tests/casper_tests/10-admin.js
index 7e4b6ae51c..9529cb3745 100644
--- a/frontend_tests/casper_tests/10-admin.js
+++ b/frontend_tests/casper_tests/10-admin.js
@@ -205,14 +205,16 @@ casper.then(function () {
 // Test uploading realm icon image
 casper.then(function () {
     casper.click("li[data-section='organization-settings']");
-    casper.test.assertExists('img#realm-settings-icon[src^="https://secure.gravatar.com/avatar/"]');
-    casper.test.assertEqual(casper.visible('#realm_icon_delete_button'), false);
-    casper.fill('form.admin-realm-form', {
-            realm_icon_file_input: 'static/images/logo/zulip-icon-128x128.png',
-        }, true);
-    casper.waitWhileVisible("#upload_icon_spinner .loading_indicator_spinner", function () {
-        casper.test.assertExists('img#realm-settings-icon[src^="/user_avatars/1/realm/icon.png?version=2"]');
-        casper.test.assertEqual(casper.visible('#realm_icon_delete_button'), true);
+    var selector = 'img#realm-settings-icon[src^="https://secure.gravatar.com/avatar/"]';
+    casper.waitUntilVisible(selector, function () {
+        casper.test.assertEqual(casper.visible('#realm_icon_delete_button'), false);
+        casper.fill('form.admin-realm-form', {
+                realm_icon_file_input: 'static/images/logo/zulip-icon-128x128.png',
+            }, true);
+        casper.waitWhileVisible("#upload_icon_spinner .loading_indicator_spinner", function () {
+            casper.test.assertExists('img#realm-settings-icon[src^="/user_avatars/1/realm/icon.png?version=2"]');
+            casper.test.assertEqual(casper.visible('#realm_icon_delete_button'), true);
+        });
     });
 });