diff --git a/commands/http/multifilereader_test.go b/commands/http/multifilereader_test.go
new file mode 100644
index 000000000..fc0309e93
--- /dev/null
+++ b/commands/http/multifilereader_test.go
@@ -0,0 +1,105 @@
+package http
+
+import (
+	"io"
+	"mime/multipart"
+	"strings"
+	"testing"
+
+	cmds "github.com/jbenet/go-ipfs/commands"
+)
+
+func TestOutput(t *testing.T) {
+	text := "Some text! :)"
+	files := []cmds.File{
+		&cmds.ReaderFile{"file.txt", strings.NewReader(text)},
+		&cmds.SliceFile{"boop", []cmds.File{
+			&cmds.ReaderFile{"boop/a.txt", strings.NewReader("bleep")},
+			&cmds.ReaderFile{"boop/b.txt", strings.NewReader("bloop")},
+		}},
+		&cmds.ReaderFile{"beep.txt", strings.NewReader("beep")},
+	}
+	sf := &cmds.SliceFile{"", files}
+	buf := make([]byte, 20)
+
+	// testing output by reading it with the go stdlib "mime/multipart" Reader
+	mfr := NewMultiFileReader(sf, true)
+	mpReader := multipart.NewReader(mfr, mfr.Boundary())
+
+	part, err := mpReader.NextPart()
+	if part == nil || err != nil {
+		t.Error("Expected non-nil part, nil error")
+	}
+	mpf, err := cmds.NewFileFromPart(part)
+	if mpf == nil || err != nil {
+		t.Error("Expected non-nil MultipartFile, nil error")
+	}
+	if mpf.IsDirectory() {
+		t.Error("Expected file to not be a directory")
+	}
+	if mpf.FileName() != "file.txt" {
+		t.Error("Expected filename to be \"file.txt\"")
+	}
+	if n, err := mpf.Read(buf); n != len(text) || err != nil {
+		t.Error("Expected to read from file", n, err)
+	}
+	if string(buf[:len(text)]) != text {
+		t.Error("Data read was different than expected")
+	}
+
+	part, err = mpReader.NextPart()
+	if part == nil || err != nil {
+		t.Error("Expected non-nil part, nil error")
+	}
+	mpf, err = cmds.NewFileFromPart(part)
+	if mpf == nil || err != nil {
+		t.Error("Expected non-nil MultipartFile, nil error")
+	}
+	if !mpf.IsDirectory() {
+		t.Error("Expected file to be a directory")
+	}
+	if mpf.FileName() != "boop" {
+		t.Error("Expected filename to be \"boop\"")
+	}
+
+	child, err := mpf.NextFile()
+	if child == nil || err != nil {
+		t.Error("Expected to be able to read a child file")
+	}
+	if child.IsDirectory() {
+		t.Error("Expected file to not be a directory")
+	}
+	if child.FileName() != "boop/a.txt" {
+		t.Error("Expected filename to be \"some/file/path\"")
+	}
+
+	child, err = mpf.NextFile()
+	if child == nil || err != nil {
+		t.Error("Expected to be able to read a child file")
+	}
+	if child.IsDirectory() {
+		t.Error("Expected file to not be a directory")
+	}
+	if child.FileName() != "boop/b.txt" {
+		t.Error("Expected filename to be \"some/file/path\"")
+	}
+
+	child, err = mpf.NextFile()
+	if child != nil || err != io.EOF {
+		t.Error("Expected to get (nil, io.EOF)")
+	}
+
+	part, err = mpReader.NextPart()
+	if part == nil || err != nil {
+		t.Error("Expected non-nil part, nil error")
+	}
+	mpf, err = cmds.NewFileFromPart(part)
+	if mpf == nil || err != nil {
+		t.Error("Expected non-nil MultipartFile, nil error")
+	}
+
+	part, err = mpReader.NextPart()
+	if part != nil || err != io.EOF {
+		t.Error("Expected to get (nil, io.EOF)")
+	}
+}