diff --git a/basis/help/markup/markup-tests.factor b/basis/help/markup/markup-tests.factor
index 2e986c60d2..c7a1da02df 100644
--- a/basis/help/markup/markup-tests.factor
+++ b/basis/help/markup/markup-tests.factor
@@ -1,11 +1,14 @@
-USING: definitions help help.markup kernel sequences tools.test
-words parser namespaces assocs generic io.streams.string accessors
-strings math ;
+USING: accessors assocs definitions fry generic help
+help.markup io.streams.string kernel math namespaces parser
+sequences strings tools.test words ;
 IN: help.markup.tests
 
+: with-markup-test ( quot -- )
+    '[ f last-element set _ with-string-writer ] with-scope ; inline
+
 TUPLE: blahblah quux ;
 
-[ "int" ] [ [ { "int" } $instance ] with-string-writer ] unit-test
+[ "int" ] [ [ { "int" } $instance ] with-markup-test ] unit-test
 
 [ ] [ \ quux>> print-topic ] unit-test
 [ ] [ \ >>quux print-topic ] unit-test
@@ -18,54 +21,54 @@ TUPLE: blahblah quux ;
 [ ] [ gensym print-topic ] unit-test
 
 [ "a string" ]
-[ [ { $or string } print-element ] with-string-writer ] unit-test
+[ [ { $or string } print-element ] with-markup-test ] unit-test
 
 [ "a string or an integer" ]
-[ [ { $or string integer } print-element ] with-string-writer ] unit-test
+[ [ { $or string integer } print-element ] with-markup-test ] unit-test
 
 [ "a string, a fixnum, or an integer" ]
-[ [ { $or string fixnum integer } print-element ] with-string-writer ] unit-test
+[ [ { $or string fixnum integer } print-element ] with-markup-test ] unit-test
 
 ! Layout
 
 [ "span" ]
-[ [ { "span" } print-content ] with-string-writer ] unit-test
+[ [ { "span" } print-content ] with-markup-test ] unit-test
 
 [ "span1span2" ]
-[ [ { "span1" "span2" } print-content ] with-string-writer ] unit-test
+[ [ { "span1" "span2" } print-content ] with-markup-test ] unit-test
 
 [ "span1\n\nspan2" ]
-[ [ { "span1" { $nl } "span2" } print-content ] with-string-writer ] unit-test
+[ [ { "span1" { $nl } "span2" } print-content ] with-markup-test ] unit-test
 
 [ "\nspan" ]
-[ [ { { $nl } "span" } print-content ] with-string-writer ] unit-test
+[ [ { { $nl } "span" } print-content ] with-markup-test ] unit-test
 
 [ "2 2 +\nspan" ]
-[ [ { { $code "2 2 +" } "span" } print-content ] with-string-writer ] unit-test
+[ [ { { $code "2 2 +" } "span" } print-content ] with-markup-test ] unit-test
 
 [ "2 2 +" ]
-[ [ { { $code "2 2 +" } } print-content ] with-string-writer ] unit-test
+[ [ { { $code "2 2 +" } } print-content ] with-markup-test ] unit-test
 
 [ "span\n2 2 +" ]
-[ [ { "span" { $code "2 2 +" } } print-content ] with-string-writer ] unit-test
+[ [ { "span" { $code "2 2 +" } } print-content ] with-markup-test ] unit-test
 
 [ "\n2 2 +" ]
-[ [ { { $nl } { $code "2 2 +" } } print-content ] with-string-writer ] unit-test
+[ [ { { $nl } { $code "2 2 +" } } print-content ] with-markup-test ] unit-test
 
 [ "span\n\n2 2 +" ]
-[ [ { "span" { $nl } { $code "2 2 +" } } print-content ] with-string-writer ] unit-test
+[ [ { "span" { $nl } { $code "2 2 +" } } print-content ] with-markup-test ] unit-test
 
 [ "Heading" ]
-[ [ { { $heading "Heading" } } print-content ] with-string-writer ] unit-test
+[ [ { { $heading "Heading" } } print-content ] with-markup-test ] unit-test
 
 [ "Heading1\n\nHeading2" ]
-[ [ { { $heading "Heading1" } { $heading "Heading2" } } print-content ] with-string-writer ] unit-test
+[ [ { { $heading "Heading1" } { $heading "Heading2" } } print-content ] with-markup-test ] unit-test
 
 [ "span\n\nHeading" ]
-[ [ { "span" { $heading "Heading" } } print-content ] with-string-writer ] unit-test
+[ [ { "span" { $heading "Heading" } } print-content ] with-markup-test ] unit-test
 
 [ "\nHeading" ]
-[ [ { { $nl } { $heading "Heading" } } print-content ] with-string-writer ] unit-test
+[ [ { { $nl } { $heading "Heading" } } print-content ] with-markup-test ] unit-test
 
 [ "span\n\nHeading" ]
-[ [ { "span" { $nl } { $heading "Heading" } } print-content ] with-string-writer ] unit-test
+[ [ { "span" { $nl } { $heading "Heading" } } print-content ] with-markup-test ] unit-test