diff --git a/viewport/META.yml b/viewport/META.yml
new file mode 100644
index 000000000000000..38eb8c0cb93a219
--- /dev/null
+++ b/viewport/META.yml
@@ -0,0 +1,4 @@
+spec: https://drafts.csswg.org/css-viewport-1/
+suggested_reviewers:
+  - bokand
+  - chrishtr
diff --git a/viewport/WEB_FEATURES.yml b/viewport/WEB_FEATURES.yml
new file mode 100644
index 000000000000000..8f93ba9790f5a9f
--- /dev/null
+++ b/viewport/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: viewport
+  files: "**"
diff --git a/viewport/viewport-segments.html b/viewport/viewport-segments.html
new file mode 100644
index 000000000000000..64f0eb9caefb0b8
--- /dev/null
+++ b/viewport/viewport-segments.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Viewport Segments: viewport.segments</title>
+<link rel="help" href="https://drafts.csswg.org/css-viewport-1/"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+"use strict";
+
+test(() => {
+  assert_true('segments' in viewport, "`segments` must be a property of viewport.");
+  assert_equals(viewport.segments, null, "For a viewport not segmented, no segments must be exposed.");
+});
+</script>
diff --git a/visual-viewport/viewport-segments.tentative.html b/visual-viewport/viewport-segments.tentative.html
deleted file mode 100644
index c90ed29d730dbaf..000000000000000
--- a/visual-viewport/viewport-segments.tentative.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Viewport Segments: visualViewport.segments tentative</title>
-<link rel="help" href="https://wicg.github.io/visual-viewport/"/>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-"use strict";
-
-test(() => {
-  assert_true('segments' in visualViewport, "`segments` must be a property of visualViewport.");
-  assert_equals(visualViewport.segments, null, "For a viewport not segmented, no segments must be exposed.");
-});
-</script>
-
