diff --git a/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png b/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png
index 0c30f8fea..4ee71428f 100644
Binary files a/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png and b/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png differ
diff --git a/metrics/expectations/platform-ios/render-tests/sprites/2x-screen-2x-pattern/expected.png b/metrics/expectations/platform-ios/render-tests/sprites/2x-screen-2x-pattern/expected.png
new file mode 100644
index 000000000..9eb839096
Binary files /dev/null and b/metrics/expectations/platform-ios/render-tests/sprites/2x-screen-2x-pattern/expected.png differ
diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake
index 2458e3d44..48f83daaf 100644
--- a/platform/ios/ios.cmake
+++ b/platform/ios/ios.cmake
@@ -1,4 +1,5 @@
 option(MBGL_WITH_IOS_CCACHE "Enable ccache for iOS" OFF)
+option(MBGL_IOS_RENDER_TEST "Include render tests" ON)
 
 if(NOT DEFINED IOS_DEPLOYMENT_TARGET)
     set(IOS_DEPLOYMENT_TARGET "11.0")
diff --git a/render-test/ios/ios_test_runner.cpp b/render-test/ios/ios_test_runner.cpp
index bb93db489..cc311273a 100644
--- a/render-test/ios/ios_test_runner.cpp
+++ b/render-test/ios/ios_test_runner.cpp
@@ -20,16 +20,13 @@ bool TestRunner::startTest(const std::string& manifestBasePath) {
 
         int finishedTestCount = 0;
         std::function<void()> testStatus = [&]() {
-            mbgl::Log::Info(mbgl::Event::General, "Current finished tests number is '%d' ", ++finishedTestCount);
+            mbgl::Log::Info(mbgl::Event::General, "Current finished tests number is '" + std::to_string(++finishedTestCount) + "' ");
         };
-        mbgl::Log::Info(mbgl::Event::General, "Start running RenderTestRunner with manifest: '%s'", manifest.c_str());
+        mbgl::Log::Info(mbgl::Event::General, "Start running RenderTestRunner with manifest: '" + manifest + "' ");
 
         auto result = mbgl::runRenderTests(static_cast<int>(argv.size() - 1), argv.data(), testStatus);
 
-        mbgl::Log::Info(mbgl::Event::General,
-                        "End running RenderTestRunner with manifest: '%s' with result value %d",
-                        manifest.c_str(),
-                        result);
+        mbgl::Log::Info(mbgl::Event::General, "End running RenderTestRunner with manifest: '" + manifest + "' with result value " +  std::to_string(result));
         return result == 0;
     };
 
diff --git a/vendor/zip-archive.cmake b/vendor/zip-archive.cmake
index b22586b41..bb5e8720a 100644
--- a/vendor/zip-archive.cmake
+++ b/vendor/zip-archive.cmake
@@ -7,7 +7,7 @@ add_library(
     ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/SSZipArchive.h
     ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/SSZipArchive.m
     ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/SSZipCommon.h
-    ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/ZipArchive.h
+    ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/include/ZipArchive.h
     ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/minizip/mz.h
     ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/minizip/mz_compat.c
     ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/minizip/mz_compat.h
@@ -57,5 +57,6 @@ target_compile_definitions(
         HAVE_STDINT_H
         HAVE_WZAES
         HAVE_ZLIB
+        ZLIB_COMPAT
 )
 set_property(TARGET mbgl-vendor-zip-archive PROPERTY FOLDER RenderTestApp)