diff --git a/library/test/interpreter.factor b/library/test/interpreter.factor
index 34ce6e32a5..7f9cc142d2 100644
--- a/library/test/interpreter.factor
+++ b/library/test/interpreter.factor
@@ -2,9 +2,7 @@ IN: temporary
 USING: errors interpreter io kernel math math-internals
 namespaces prettyprint sequences test ;
 
-: done-all? ( -- ? ) done? meta-c get empty? and ;
-
-: run ( -- ) done-all? [ next do run ] unless ;
+: run ( -- ) done? [ step-in run ] unless ;
 
 : init-interpreter ( -- )
     V{ } clone meta-d set
diff --git a/library/tools/interpreter.factor b/library/tools/interpreter.factor
index cc5fb3f10e..8d763aae02 100644
--- a/library/tools/interpreter.factor
+++ b/library/tools/interpreter.factor
@@ -50,7 +50,7 @@ SYMBOL: callframe-end
 : (next)
     callframe-scan get callframe get nth callframe-scan inc ;
 
-: next ( quot -- obj )
+: next ( quot -- )
     {
         { [ done? ] [ drop [ ] (meta-call) ] }
         { [ done-cf? ] [ drop up ] }