diff --git a/extra/tools/disassembler/disassembler-tests.factor b/extra/tools/disassembler/disassembler-tests.factor
index 2a89fe908e..9983db7d00 100755
--- a/extra/tools/disassembler/disassembler-tests.factor
+++ b/extra/tools/disassembler/disassembler-tests.factor
@@ -1,5 +1,6 @@
 IN: tools.disassembler.tests
-USING: math tuples prettyprint.backend tools.disassembler ;
+USING: math tuples prettyprint.backend tools.disassembler
+tools.test strings ;
 
 [ ] [ \ + disassemble ] unit-test
-[ ] [ { tuple prettyprint* } disassemble ] unit-test
+[ ] [ { string pprint* } disassemble ] unit-test
diff --git a/extra/tools/disassembler/disassembler.factor b/extra/tools/disassembler/disassembler.factor
index 2fa882ff68..479ae9c42c 100755
--- a/extra/tools/disassembler/disassembler.factor
+++ b/extra/tools/disassembler/disassembler.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.files io words alien kernel math.parser alien.syntax
 io.launcher system assocs arrays sequences namespaces qualified
-system math generator.fixup io.encodings.ascii accessors ;
+system math generator.fixup io.encodings.ascii accessors
+generic ;
 IN: tools.disassembler
 
 : in-file "gdb-in.txt" temp-file ;
@@ -22,6 +23,9 @@ M: pair make-disassemble-cmd
         [ number>string write bl ] each
     ] with-file-writer ;
 
+M: method-spec make-disassemble-cmd
+    first2 method make-disassemble-cmd ;
+
 : run-gdb ( -- lines )
     <process>
         +closed+ >>stdin