diff --git a/rendering/cases/linestring-style/index.html b/rendering/cases/linestring-style/index.html
deleted file mode 100644
index 96cfb5a582..0000000000
--- a/rendering/cases/linestring-style/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-      html, body {
-        margin: 0;
-        padding: 0;
-        width: 100%;
-        height: 100%;
-      }
-      #map {
-        width: 100%;
-        height: 100%;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="map"></div>
-    <script src="main.js"></script>
-  </body>
-  </script>
-</html>
diff --git a/rendering/cases/multiple-layers/index.html b/rendering/cases/multiple-layers/index.html
deleted file mode 100644
index 96cfb5a582..0000000000
--- a/rendering/cases/multiple-layers/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-      html, body {
-        margin: 0;
-        padding: 0;
-        width: 100%;
-        height: 100%;
-      }
-      #map {
-        width: 100%;
-        height: 100%;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="map"></div>
-    <script src="main.js"></script>
-  </body>
-  </script>
-</html>
diff --git a/rendering/cases/single-layer/index.html b/rendering/cases/single-layer/index.html
deleted file mode 100644
index 8ee3c8d0a6..0000000000
--- a/rendering/cases/single-layer/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-      html, body {
-        margin: 0;
-        padding: 0;
-        width: 100%;
-        height: 100%;
-      }
-      #map {
-        width: 100%;
-        height: 100%;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="map"></div>
-    <script src="main.js"></script>
-  </body>
-  </script>
-</html>
\ No newline at end of file
diff --git a/rendering/cases/icon-symbol/index.html b/rendering/default/index.html
similarity index 100%
rename from rendering/cases/icon-symbol/index.html
rename to rendering/default/index.html
diff --git a/rendering/test.js b/rendering/test.js
index 13af9f4eba..616699b61c 100755
--- a/rendering/test.js
+++ b/rendering/test.js
@@ -22,19 +22,33 @@ function getHref(entry) {
 
 const staticHandler = serveStatic(__dirname);
 
+const defaultHandler = serveStatic(path.join(__dirname, 'default'));
+
+function indexHandler(req, res) {
+  const items = [];
+  for (const key in config.entry) {
+    const href = getHref(config.entry[key]);
+    items.push(`<li><a href="${href}">${href}</a></li>`);
+  }
+  const markup = `<!DOCTYPE html><body><ul>${items.join('')}</ul></body>`;
+
+  res.writeHead(404, {
+    'Content-Type': 'text/html'
+  });
+  res.end(markup);
+}
+
 function notFound(req, res) {
   return () => {
-    const items = [];
-    for (const key in config.entry) {
-      const href = getHref(config.entry[key]);
-      items.push(`<li><a href="${href}">${href}</a></li>`);
+    // first, try the default directory
+    if (req.url.match(/^\/cases\/[^\/]+\/(index.html)?$/)) {
+      // request for a case index file, and file not found, use default
+      req.url = '/index.html';
+      return defaultHandler(req, res, () => indexHandler(req, res));
     }
-    const markup = `<!DOCTYPE html><body><ul>${items.join('')}</ul></body>`;
 
-    res.writeHead(404, {
-      'Content-Type': 'text/html'
-    });
-    res.end(markup);
+    // fall back to a listing of all cases
+    indexHandler(req, res);
   };
 }
 
