diff --git a/core/commands/root.go b/core/commands/root.go
index 6b1044f18b2..e49a2271be5 100644
--- a/core/commands/root.go
+++ b/core/commands/root.go
@@ -171,7 +171,6 @@ var rootROOldSubcommands = map[string]*oldcmds.Command{
 			"links": ocmd.ObjectLinksCmd,
 			"get":   ocmd.ObjectGetCmd,
 			"stat":  ocmd.ObjectStatCmd,
-			"patch": ocmd.ObjectPatchCmd,
 		},
 	},
 	"dag": &oldcmds.Command{
diff --git a/test/sharness/t0082-repo-gc-auto.sh b/test/sharness/t0082-repo-gc-auto.sh
index 04cfdb0bd45..00c4b9e3ccb 100755
--- a/test/sharness/t0082-repo-gc-auto.sh
+++ b/test/sharness/t0082-repo-gc-auto.sh
@@ -65,7 +65,7 @@ test_gc() {
 test_expect_success "periodic auto gc stress test" '
   for i in $(test_seq 1 20)
   do
-    test_gc
+    test_gc || return 1
   done
 '
 
diff --git a/test/sharness/t0110-gateway.sh b/test/sharness/t0110-gateway.sh
index b64cb799f76..c5a4aa39c75 100755
--- a/test/sharness/t0110-gateway.sh
+++ b/test/sharness/t0110-gateway.sh
@@ -139,11 +139,38 @@ test_expect_success "refs IPFS directory file through readonly API succeeds" '
   test_curl_gateway_api "refs?arg=$HASH2/test"
 '
 
-test_expect_success "test gateway api is sanitized" '
-  for cmd in "add" "block/put" "bootstrap" "config" "dht" "diag" "dns" "get" "id" "mount" "name/publish" "object/put" "object/new" "object/patch" "pin" "ping" "refs/local" "repo" "resolve" "stats" "swarm"  "file" "update" "version" "bitswap"; do
+for cmd in add  \
+           block/put \
+           bootstrap \
+           config \
+           dht \
+           diag \
+           id \
+           mount \
+           name/publish \
+           object/put \
+           object/new \
+           object/patch \
+           pin \
+           ping \
+           repo \
+           stats \
+           swarm \
+           file \
+           update \
+           bitswap
+do
+  test_expect_success "test gateway api is sanitized: $cmd" '
     test_curl_resp_http_code "http://127.0.0.1:$port/api/v0/$cmd" "HTTP/1.1 404 Not Found"
-  done
-'
+  '
+done
+
+# This one is different. `local` will be interpreted as a path if the command isn't defined.
+test_expect_success "test gateway api is sanitized: refs/local" '
+    echo "Error: invalid '"'ipfs ref'"' path" > refs_local_expected &&
+    ! ipfs --api /ip4/127.0.0.1/tcp/$port refs local > refs_local_actual 2>&1 &&
+    test_cmp refs_local_expected refs_local_actual
+  '
 
 test_expect_success "create raw-leaves node" '
   echo "This is RAW!" > rfile &&
diff --git a/test/sharness/t0250-files-api.sh b/test/sharness/t0250-files-api.sh
index ecdf97925a8..a1e813fe538 100755
--- a/test/sharness/t0250-files-api.sh
+++ b/test/sharness/t0250-files-api.sh
@@ -58,7 +58,7 @@ test_sharding() {
     printf "" > list_exp_raw
     for i in `seq 100`
     do
-      echo $i | ipfs files write --create /foo/file$i
+      echo $i | ipfs files write --create /foo/file$i || return 1
       echo file$i >> list_exp_raw
     done
   '