diff --git a/go/.bazel_fix_commands.json b/go/.bazel_fix_commands.json
new file mode 100644
index 0000000000..7507f876e7
--- /dev/null
+++ b/go/.bazel_fix_commands.json
@@ -0,0 +1,5 @@
+[{
+  "regex": "^No dependencies were provided.",
+  "command": "bazel",
+  "args": ["run", "//:gazelle"]
+}]
diff --git a/go/Makefile b/go/Makefile
index a23e7aca16..f112572801 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -8,7 +8,7 @@ BAZEL_CMD_ARGS ?=
 GO ?= go
 GO_TEST_OPTS ?= -test.timeout=20s
 GOPATH ?= $(HOME)/go
-IBAZEL ?= ibazel
+IBAZEL ?= ibazel --run_output_interactive=false --run_output
 USE_IBAZEL ?= false
 BAZEL_WRAPPER ?= $(BAZEL)
 
diff --git a/go/gen.sum b/go/gen.sum
index 0434fe53b1..1dc71fde48 100644
--- a/go/gen.sum
+++ b/go/gen.sum
@@ -9,4 +9,4 @@ d065506424cab800ecca466ceca2f07dd71893ce  ../api/go-internal/log_entry_member.pr
 c4d8ae1bb2b1e3119bed152e705f4e84129f48c6  ../api/go-internal/log_entry_setting.proto
 d8c797e0f3efd2b4f26a9ff949bedb786891a850  ../api/go-internal/protocolmodel.proto
 50384eff13181fb905dee2b7df62276408e3dc62  ../api/go-internal/sigchain.proto
-263c18edf44ebd2a08a4b31e5b93746e04502aaa  Makefile
+fb3f2cb9e9403abd4cd80767b00d408cb59665a9  Makefile