diff --git a/core/commands/keystore.go b/core/commands/keystore.go
index 611dd58ffbb..75eff41208e 100644
--- a/core/commands/keystore.go
+++ b/core/commands/keystore.go
@@ -143,7 +143,7 @@ var KeyListCmd = &cmds.Command{
 		Tagline: "List all local keypairs",
 	},
 	Options: []cmds.Option{
-		cmds.BoolOption("show-ids", "l", "also show key ids"),
+		cmds.BoolOption("l", "Show extra information about keys."),
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 		n, err := req.InvocContext().GetNode()
@@ -189,7 +189,7 @@ var KeyListCmd = &cmds.Command{
 }
 
 func keyOutputListMarshaler(res cmds.Response) (io.Reader, error) {
-	withId, _, _ := res.Request().Option("show-ids").Bool()
+	withId, _, _ := res.Request().Option("l").Bool()
 
 	list, ok := res.Output().(*KeyOutputList)
 	if !ok {
diff --git a/test/sharness/t0165-keystore.sh b/test/sharness/t0165-keystore.sh
new file mode 100755
index 00000000000..1d94d4f4643
--- /dev/null
+++ b/test/sharness/t0165-keystore.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Copyright (c) 2017 Jeromy Johnson
+# MIT Licensed; see the LICENSE file in this repository.
+#
+
+test_description="Test keystore commands"
+
+. lib/test-lib.sh
+
+test_init_ipfs
+
+test_key_cmd() {
+	test_expect_success "create a new rsa key" '
+		rsahash=$(ipfs key gen foobarsa --type=rsa --size=2048)
+	'
+
+	test_expect_success "create a new ed25519 key" '
+		edhash=$(ipfs key gen bazed --type=ed25519)
+	'
+
+	test_expect_success "both keys show up in list output" '
+		echo bazed > list_exp &&
+		echo foobarsa >> list_exp &&
+		ipfs key list | sort > list_out &&
+		test_cmp list_exp list_out
+	'
+
+	test_expect_success "key hashes show up in long list output" '
+		ipfs key list -l | grep $edhash > /dev/null &&
+		ipfs key list -l | grep $rsahash > /dev/null
+	'
+}
+
+test_key_cmd
+
+test_done