diff --git a/test/data/corner_cases.zim b/test/data/corner_cases.zim
index 650c1d962..4e5a348af 100644
Binary files a/test/data/corner_cases.zim and b/test/data/corner_cases.zim differ
diff --git a/test/data/create_corner_cases_zim_file b/test/data/create_corner_cases_zim_file
index 9462a63ea..93c8793ba 100755
--- a/test/data/create_corner_cases_zim_file
+++ b/test/data/create_corner_cases_zim_file
@@ -2,8 +2,9 @@
 
 cd "$(dirname "$0")"
 rm -f corner_cases.zim
-zimwriterfs -w empty.html \
-            -f empty.png \
+zimwriterfs --withoutFTIndex --dont-check-arguments \
+            -w empty.html \
+            -I empty.png \
             -l=en \
             -t="ZIM corner cases" \
             -d="" \
diff --git a/test/server.cpp b/test/server.cpp
index 0780a3949..bc53fb8d7 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -157,9 +157,9 @@ const ResourceCollection resources200Uncompressible{
 
   { ZIM_CONTENT,     "/ROOT/content/zimfile/I/m/Ray_Charles_classic_piano_pose.jpg" },
 
-  { ZIM_CONTENT,     "/ROOT/content/corner_cases/A/empty.html" },
-  { ZIM_CONTENT,     "/ROOT/content/corner_cases/-/empty.css" },
-  { ZIM_CONTENT,     "/ROOT/content/corner_cases/-/empty.js" },
+  { ZIM_CONTENT,     "/ROOT/content/corner_cases/empty.html" },
+  { ZIM_CONTENT,     "/ROOT/content/corner_cases/empty.css" },
+  { ZIM_CONTENT,     "/ROOT/content/corner_cases/empty.js" },
 
 
   // The following url's responses are too small to be compressed
@@ -1507,7 +1507,7 @@ TEST_F(ServerTest, InvalidAndMultiRangeByteRangeRequestsResultIn416Responses)
 
 TEST_F(ServerTest, ValidByteRangeRequestsOfZeroSizedEntriesResultIn416Responses)
 {
-  const char url[] = "/ROOT/content/corner_cases/-/empty.js";
+  const char url[] = "/ROOT/content/corner_cases/empty.js";
 
   const char* ranges[] = {
     "bytes=0-",