diff --git a/test/sharness/t0010-basic-commands.sh b/test/sharness/t0010-basic-commands.sh
index 9cf306a5d..2b8e8dd80 100755
--- a/test/sharness/t0010-basic-commands.sh
+++ b/test/sharness/t0010-basic-commands.sh
@@ -17,7 +17,7 @@ test_expect_success "ipfs version succeeds" '
 '
 
 test_expect_success "ipfs version output looks good" '
-	cat version.txt | egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" >/dev/null ||
+	egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" version.txt >/dev/null ||
 	test_fsh cat version.txt
 '
 
@@ -26,9 +26,27 @@ test_expect_success "ipfs help succeeds" '
 '
 
 test_expect_success "ipfs help output looks good" '
-	cat help.txt | egrep -i "^Usage:" >/dev/null &&
-	cat help.txt | egrep "ipfs .* <command>" >/dev/null ||
+	egrep -i "^Usage:" help.txt >/dev/null &&
+	egrep "ipfs .* <command>" help.txt >/dev/null ||
 	test_fsh cat help.txt
 '
 
+test_expect_success "'ipfs commands' succeeds" '
+	ipfs commands >commands.txt
+'
+
+test_expect_success "'ipfs commands' output looks good" '
+	grep "ipfs add" commands.txt &&
+	grep "ipfs daemon" commands.txt &&
+	grep "ipfs update" commands.txt
+'
+
+test_expect_success "All commands accept --help" '
+	while read -r cmd
+	do
+		echo "running: $cmd --help"
+		$cmd --help </dev/null >/dev/null || return
+	done <commands.txt
+'
+
 test_done
diff --git a/test/sharness/t0060-daemon.sh b/test/sharness/t0060-daemon.sh
index 44bb87515..9d0bce03c 100755
--- a/test/sharness/t0060-daemon.sh
+++ b/test/sharness/t0060-daemon.sh
@@ -60,7 +60,7 @@ test_expect_success "ipfs daemon output looks good" '
   echo "peer identity: $PEERID" >>expected_daemon &&
   echo "to get started, enter:" >>expected_daemon &&
   printf "\\n\\t$STARTFILE\\n\\n" >>expected_daemon &&
-  cat local_addrs | sed "s/^/Swarm listening on /" >>expected_daemon &&
+  sed "s/^/Swarm listening on /" local_addrs >>expected_daemon &&
   echo "API server listening on /ip4/127.0.0.1/tcp/5001" >>expected_daemon &&
   echo "Gateway (readonly) server listening on /ip4/127.0.0.1/tcp/8080" >>expected_daemon &&
   echo "Daemon is ready" >>expected_daemon &&
@@ -82,7 +82,7 @@ test_expect_success "ipfs version succeeds" '
 '
 
 test_expect_success "ipfs version output looks good" '
-	cat version.txt | egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" >/dev/null ||
+	egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" version.txt >/dev/null ||
 	test_fsh cat version.txt
 '
 
@@ -91,8 +91,8 @@ test_expect_success "ipfs help succeeds" '
 '
 
 test_expect_success "ipfs help output looks good" '
-	cat help.txt | egrep -i "^Usage:" >/dev/null &&
-	cat help.txt | egrep "ipfs .* <command>" >/dev/null ||
+	egrep -i "^Usage:" help.txt >/dev/null &&
+	egrep "ipfs .* <command>" help.txt >/dev/null ||
 	test_fsh cat help.txt
 '