diff --git a/assets/assets.go b/assets/assets.go
index d203089f8b9be75732e4e8e36dcaebce54b09b79..e8893c63501cfb5f7468b3cf81065eb20ccc651e 100644
--- a/assets/assets.go
+++ b/assets/assets.go
@@ -1,8 +1,8 @@
 //go:generate git submodule update --init ./dir-index-html
 //go:generate go run github.com/go-bindata/go-bindata/v3/go-bindata -mode=0644 -modtime=1403768328 -pkg=assets init-doc dir-index-html/dir-index.html dir-index-html/knownIcons.txt
-//go:generate gofmt -sw bindata.go
+//go:generate gofmt -s -w bindata.go
 //go:generate sh -c "sed -i \"s/.*BindataVersionHash.*/BindataVersionHash=\\\"$(git hash-object bindata.go)\\\"/\" bindata_version_hash.go"
-//go:generate gofmt -sw bindata_version_hash.go
+//go:generate gofmt -s -w bindata_version_hash.go
 package assets
 
 import (
diff --git a/bin/test-go-fmt b/bin/test-go-fmt
index 8bd1f07bf2e8a9db6af2eca8a6f1936bcc204568..3f69d83895a387b230052799d54da45e6c71ba0d 100755
--- a/bin/test-go-fmt
+++ b/bin/test-go-fmt
@@ -4,7 +4,7 @@ T="$(mktemp)"
 find . \
     -path ./test/sharness -prune \
  -o -path ./plugin/loader/preload.go -prune \
- -o -name '*.go' -print0 | xargs -0 gofmt -sl > "$T"
+ -o -name '*.go' -print0 | xargs -0 gofmt -s -l > "$T"
 
 if [ -n "$(cat $T)" ]; then
 	echo "Following Go code is not formatted."