diff --git a/demo/client/src/integration-test.ts b/demo/client/src/integration-test.ts
index 813050e5..69224f03 100644
--- a/demo/client/src/integration-test.ts
+++ b/demo/client/src/integration-test.ts
@@ -20,6 +20,7 @@ import {Renderer} from "./renderer";
 import {ShaderMap, ShaderProgramSource} from "./shader-loader";
 import SSAAStrategy from './ssaa-strategy';
 import {BUILTIN_FONT_URI, computeStemDarkeningAmount, ExpandedMeshData, GlyphStore} from "./text";
+import {Hint} from "./text";
 import {PathfinderFont, TextFrame, TextRun} from "./text";
 import {unwrapNull} from "./utils";
 import {DemoView} from "./view";
@@ -92,9 +93,7 @@ class IntegrationTestAppController extends DemoAppController<IntegrationTestView
             const expandedMeshes = textFrame.expandMeshes(this.baseMeshes, glyphIDs);
             this.expandedMeshes = expandedMeshes;
 
-            this.view.then(view => {
-                view.attachMeshes([expandedMeshes.meshes]);
-            });
+            this.view.then(view => view.attachMeshes([expandedMeshes.meshes]));
         });
 
         this.loadInitialReference();
@@ -277,22 +276,29 @@ class IntegrationTestRenderer extends Renderer {
         const appController = this.renderContext.appController;
         const canvas = this.renderContext.canvas;
         const font = unwrapNull(appController.font);
+        const hint = new Hint(font, this.pixelsPerUnit, true);
+        const canvasHeight = canvas.height;
 
         const pathTransforms = new Float32Array(4 * (STRING.length + 1));
 
-        let currentX = 0, currentY = 0;
+        let currentX = 0;
         const availableWidth = canvas.width / this.pixelsPerUnit;
         const lineHeight = font.opentypeFont.lineHeight();
 
         for (let glyphIndex = 0; glyphIndex < STRING.length; glyphIndex++) {
-            const glyphID = unwrapNull(appController.textRun).glyphIDs[glyphIndex];
-            pathTransforms.set([1, 1, currentX, currentY], (glyphIndex + 1) * 4);
+            const textRun = unwrapNull(appController.textRun);
+            const glyphID = textRun.glyphIDs[glyphIndex];
+            const pixelRect = textRun.pixelRectForGlyphAt(glyphIndex,
+                                                          this.pixelsPerUnit,
+                                                          this.pixelsPerUnit,
+                                                          hint,
+                                                          this.stemDarkeningAmount,
+                                                          0);
+
+            const y = (canvasHeight - pixelRect[3]) / this.pixelsPerUnit;
+            pathTransforms.set([1, 1, currentX, y], (glyphIndex + 1) * 4);
 
             currentX += font.opentypeFont.glyphs.get(glyphID).advanceWidth;
-            if (currentX > availableWidth) {
-                currentX = 0;
-                currentY += lineHeight;
-            }
         }
 
         return pathTransforms;
diff --git a/font-renderer/src/core_graphics.rs b/font-renderer/src/core_graphics.rs
index e610ac77..bef9451f 100644
--- a/font-renderer/src/core_graphics.rs
+++ b/font-renderer/src/core_graphics.rs
@@ -120,7 +120,8 @@ impl FontContext {
         let subpixel_offset = Point2D::new(glyph_key.subpixel_offset.into(), 0.0);
 
         // Round out to pixel boundaries.
-        let scale = 1.0 / font_instance.size.to_f64_px();
+        let units_per_em = core_graphics_font.get_units_per_em();
+        let scale = font_instance.size.to_f64_px() / (units_per_em as f64);
         let bounding_box =
             Rect::new(Point2D::new(bounding_boxes[0].origin.x,
                                    bounding_boxes[0].origin.y),