diff --git a/src/servo/content/js.rs b/src/servo/content/js.rs
index 05f65249d09..250d2cb830b 100644
--- a/src/servo/content/js.rs
+++ b/src/servo/content/js.rs
@@ -112,10 +112,11 @@ mod test {
         let gc = jsglobal::global_class();
         cx.new_global(gc).chain {
             |glob|
-            str::bytes("x = 1;") {
+            str::as_bytes("x = 1;") {
                 |bytes|
-                cx.evaluate_script(glob, bytes, "test", 1u);
-            }
+                cx.evaluate_script(glob, bytes, "test", 1u)
+            };
+            ok(())
         };
     }
 
diff --git a/src/servo/layout/base.rs b/src/servo/layout/base.rs
index e2f1a38fa5b..cb036504d85 100644
--- a/src/servo/layout/base.rs
+++ b/src/servo/layout/base.rs
@@ -179,10 +179,10 @@ mod test {
         tree::add_child(s, n3, n1);
         tree::add_child(s, n3, n2);
 
-        let b0 = n0.construct_boxes_for_subtree();
-        let b1 = n1.construct_boxes_for_subtree();
-        let b2 = n2.construct_boxes_for_subtree();
-        let b3 = n3.construct_boxes_for_subtree();
+        let b0 = n0.construct_boxes();
+        let b1 = n1.construct_boxes();
+        let b2 = n2.construct_boxes();
+        let b3 = n3.construct_boxes();
 
         tree::add_child(btree, b3, b0);
         tree::add_child(btree, b3, b1);