diff --git a/test/sharness/t0090-get.sh b/test/sharness/t0090-get.sh
new file mode 100755
index 000000000..2dc9613d9
--- /dev/null
+++ b/test/sharness/t0090-get.sh
@@ -0,0 +1,118 @@
+#!/bin/sh
+#
+# Copyright (c) 2015 Matt Bell
+# MIT Licensed; see the LICENSE file in this repository.
+#
+
+test_description="Test get command"
+
+. lib/test-lib.sh
+
+test_init_ipfs
+test_launch_ipfs_daemon
+
+test_expect_success "'ipfs get --help' succeeds" '
+  ipfs get --help > actual
+'
+
+test_expect_success "'ipfs get --help' output looks good" '
+  egrep "ipfs get.*<ipfs-path>" actual > /dev/null ||
+  fsh cat actual
+'
+
+test_expect_success "ipfs get succeeds" '
+  echo "Hello Worlds!" > data &&
+  HASH=`ipfs add -q data` &&
+  ipfs get $HASH > actual
+'
+
+test_expect_success "ipfs get output looks good" '
+  echo "Saving file(s) to $HASH
+" > expected &&
+  test_cmp expected actual
+'
+
+test_expect_success "ipfs get file output looks good" '
+  test_cmp $HASH data
+'
+
+test_expect_success "ipfs get errors when trying to overwrite a file" '
+  test_must_fail ipfs get $HASH > actual &&
+  rm $HASH
+'
+
+test_expect_success "ipfs get -a succeeds" '
+  ipfs get $HASH -a > actual
+'
+
+test_expect_success "ipfs get -a output looks good" '
+  echo "Saving archive to $HASH.tar
+" > expected &&
+  test_cmp expected actual
+'
+
+test_expect_success "ipfs get -a archive output is valid" '
+  tar -xf "$HASH".tar &&
+  test_cmp $HASH data &&
+  rm $HASH.tar &&
+  rm $HASH
+'
+
+test_expect_success "ipfs get -a -C succeeds" '
+  ipfs get $HASH -a -C > actual
+'
+
+test_expect_success "ipfs get -a -C output looks good" '
+  echo "Saving archive to $HASH.tar.gz
+" > expected &&
+  test_cmp expected actual
+'
+
+test_expect_success "gzipped tar archive output is valid" '
+  tar -xf "$HASH".tar.gz &&
+  test_cmp $HASH data &&
+  rm "$HASH".tar.gz &&
+  rm $HASH
+'
+
+test_expect_success "ipfs get succeeds (directory)" '
+  mkdir dir &&
+  touch dir/a &&
+  mkdir dir/b &&
+  echo "Hello, Worlds!" > dir/b/c &&
+  HASH2=`ipfs add -r -q dir | tail -n 1` &&
+  ipfs get $HASH2 > actual
+'
+
+test_expect_success "ipfs get output looks good (directory)" '
+  echo "Saving file(s) to $HASH2
+" > expected &&
+  test_cmp expected actual
+'
+
+test_expect_success "ipfs get output is valid (directory)" '
+  test_cmp dir/a "$HASH2"/a &&
+  test_cmp dir/b/c "$HASH2"/b/c &&
+  rm -r $HASH2
+'
+
+test_expect_success "ipfs get -a -C succeeds (directory)" '
+  ipfs get $HASH2 -a -C > actual
+'
+
+test_expect_success "ipfs get -a -C output looks good (directory)" '
+  echo "Saving archive to "$HASH2".tar.gz
+" > expected &&
+  test_cmp expected actual
+'
+
+test_expect_success "gzipped tar archive output is valid (directory)" '
+  tar -xf "$HASH2".tar.gz &&
+  test_cmp dir/a "$HASH2"/a &&
+  test_cmp dir/b/c "$HASH2"/b/c &&
+  rm -r $HASH2
+'
+
+test_kill_ipfs_daemon
+
+test_done