diff --git a/css/zoom/iframe-zoom-nested.html b/css/css-viewport/zoom/iframe-zoom-nested.html
similarity index 100%
rename from css/zoom/iframe-zoom-nested.html
rename to css/css-viewport/zoom/iframe-zoom-nested.html
diff --git a/css/zoom/iframe-zoom.sub.html b/css/css-viewport/zoom/iframe-zoom.sub.html
similarity index 87%
rename from css/zoom/iframe-zoom.sub.html
rename to css/css-viewport/zoom/iframe-zoom.sub.html
index 82a202161b9c29..a27fb91619b6b8 100644
--- a/css/zoom/iframe-zoom.sub.html
+++ b/css/css-viewport/zoom/iframe-zoom.sub.html
@@ -35,7 +35,7 @@
   </div>
 
   <div id="another_with_zoom" style="zoom: 3;">
-    <iframe src="http://{{hosts[alt][]}}:{{ports[http][0]}}/css/zoom/tentative/resources/iframe_content.html"></iframe>
+    <iframe src="http://{{hosts[alt][]}}:{{ports[http][0]}}/css-viewport/zoom/resources/iframe_content.html"></iframe>
   </div>
 
 </body>
diff --git a/css/zoom/reference/iframe-zoom-nested-ref.html b/css/css-viewport/zoom/reference/iframe-zoom-nested-ref.html
similarity index 100%
rename from css/zoom/reference/iframe-zoom-nested-ref.html
rename to css/css-viewport/zoom/reference/iframe-zoom-nested-ref.html
diff --git a/css/zoom/reference/iframe-zoom-ref.html b/css/css-viewport/zoom/reference/iframe-zoom-ref.html
similarity index 100%
rename from css/zoom/reference/iframe-zoom-ref.html
rename to css/css-viewport/zoom/reference/iframe-zoom-ref.html
diff --git a/css/zoom/resources/iframe_content.html b/css/css-viewport/zoom/resources/iframe_content.html
similarity index 100%
rename from css/zoom/resources/iframe_content.html
rename to css/css-viewport/zoom/resources/iframe_content.html
diff --git a/css/zoom/resources/nested-iframe-no-zoom.html b/css/css-viewport/zoom/resources/nested-iframe-no-zoom.html
similarity index 100%
rename from css/zoom/resources/nested-iframe-no-zoom.html
rename to css/css-viewport/zoom/resources/nested-iframe-no-zoom.html
diff --git a/css/zoom/resources/nested-iframe-with-zoom.html b/css/css-viewport/zoom/resources/nested-iframe-with-zoom.html
similarity index 100%
rename from css/zoom/resources/nested-iframe-with-zoom.html
rename to css/css-viewport/zoom/resources/nested-iframe-with-zoom.html