diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go
index dd8ab53f4..bb925fe60 100644
--- a/commands/legacy/legacy_test.go
+++ b/commands/legacy/legacy_test.go
@@ -69,12 +69,11 @@ func TestNewCommand(t *testing.T) {
 
 	// test calling "test" command
 	testCmd := root.Subcommands["test"]
-	enc := testCmd.Encoders[oldcmds.Text]
-	if enc == nil {
-		t.Fatal("got nil encoder")
-	}
 
-	re := cmds.NewWriterResponseEmitter(WriteNopCloser{buf}, req, enc)
+	re, err := cmds.NewWriterResponseEmitter(WriteNopCloser{buf}, req)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var env oldcmds.Context
 
@@ -122,8 +121,14 @@ func TestPipePair(t *testing.T) {
 	}
 
 	r, w := io.Pipe()
-	re := cmds.NewWriterResponseEmitter(w, req, cmds.Encoders[cmds.JSON])
-	res := cmds.NewReaderResponse(r, cmds.JSON, req)
+	re, err := cmds.NewWriterResponseEmitter(w, req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	res, err := cmds.NewReaderResponse(r, req)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	wait := make(chan interface{})