diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/expected.png b/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/expected.png
new file mode 100644
index 00000000000..e0968e8aff9
Binary files /dev/null and b/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/style.json b/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/style.json
new file mode 100644
index 00000000000..e12c4b361ac
--- /dev/null
+++ b/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed-single-glyph/style.json
@@ -0,0 +1,56 @@
+{
+  "version": 8,
+  "center": [
+    -118.28162,
+    33.86852
+  ],
+  "zoom": 21,
+  "pitch": 60,
+  "bearing": 161.5,
+  "sources": {
+    "mapbox": {
+      "type": "vector",
+      "maxzoom": 16,
+      "tiles": [
+        "local://tiles/mapbox.mapbox-streets-v7/16-11235-26208.mvt"
+      ]
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "road-label-large",
+      "type": "symbol",
+      "source": "mapbox",
+      "source-layer": "road_label",
+      "layout": {
+        "text-size": { "base": 1, "stops": [ [ 9, 10 ], [ 20, 16 ] ] },
+        "text-max-angle": 30,
+        "symbol-spacing": 250,
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ],
+        "symbol-placement": "line",
+        "text-padding": 1,
+        "text-rotation-alignment": "map",
+        "text-pitch-alignment": "viewport",
+        "text-field": "C",
+        "text-letter-spacing": 0.01
+      },
+      "paint": {
+        "text-color": "hsl(0, 0%, 0%)",
+        "text-halo-color": "hsla(0, 0%, 100%, 0.75)",
+        "text-halo-width": 1,
+        "text-halo-blur": 1
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png b/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png
new file mode 100644
index 00000000000..97ad6702e44
Binary files /dev/null and b/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed/style.json b/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed/style.json
new file mode 100644
index 00000000000..2f68454b9b5
--- /dev/null
+++ b/test/integration/render-tests/text-pitch-alignment/viewport-overzoomed/style.json
@@ -0,0 +1,56 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 1024
+    }
+  },
+  "center": [
+    50,
+    0
+  ],
+  "zoom": 18,
+  "pitch": 60,
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "maxzoom": 16,
+      "data": {
+        "type": "LineString",
+        "coordinates": [
+            [ 50, -90 ],
+            [ 50, 90 ]
+        ]
+      }
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "text",
+      "type": "symbol",
+      "source": "geojson",
+      "layout": {
+        "symbol-placement": "line",
+        "symbol-spacing": 10,
+        "text-rotation-alignment": "map",
+        "text-pitch-alignment": "viewport",
+        "text-field": "Figueroa St.",
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ]
+      },
+      "paint": {
+        "text-opacity": 1
+      }
+    }
+  ]
+}
diff --git a/test/integration/tiles/mapbox.mapbox-streets-v7/16-11235-26208.mvt b/test/integration/tiles/mapbox.mapbox-streets-v7/16-11235-26208.mvt
new file mode 100644
index 00000000000..2d27c088316
Binary files /dev/null and b/test/integration/tiles/mapbox.mapbox-streets-v7/16-11235-26208.mvt differ