diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index 087b9ae9b..38a4104e7 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -181,7 +181,7 @@ void MapContext::update() {
 
         updateTiles();
 
-        if (style->isLoaded()) {
+        if (style->isLoaded() && resourceLoader->getSprite()->isLoaded()) {
             if (!data.getFullyLoaded()) {
                 data.setFullyLoaded(true);
             }
diff --git a/test/suite b/test/suite
index 769c4c9c2..0aa5ff62f 160000
--- a/test/suite
+++ b/test/suite
@@ -1 +1 @@
-Subproject commit 769c4c9c23cdb232d7c7dd657d69963ae951210a
+Subproject commit 0aa5ff62f32bf24c9ae98cdddac0dac5f7cd9b51