diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go
new file mode 100644
index 00000000000..d1acebe13c7
--- /dev/null
+++ b/core/commands/helptext_test.go
@@ -0,0 +1,36 @@
+package commands
+
+import (
+	"strings"
+	"testing"
+
+	cmds "github.com/ipfs/go-ipfs/commands"
+)
+
+func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) {
+	if c.Helptext.Tagline == "" {
+		t.Errorf("%s has no tagline!", strings.Join(name, " "))
+	}
+
+	if c.Helptext.LongDescription == "" {
+		t.Errorf("%s has no long description!", strings.Join(name, " "))
+	}
+
+	if c.Helptext.ShortDescription == "" {
+		t.Errorf("%s has no short description!", strings.Join(name, " "))
+	}
+
+	if c.Helptext.Synopsis == "" {
+		t.Errorf("%s has no synopsis!", strings.Join(name, " "))
+	}
+
+	for subname, sub := range c.Subcommands {
+		checkHelptextRecursive(t, append(name, subname), sub)
+	}
+}
+
+func TestHelptexts(t *testing.T) {
+	t.Skip("sill isn't 100%")
+	Root.ProcessHelp()
+	checkHelptextRecursive(t, []string{"ipfs"}, Root)
+}