diff --git a/HACKING.md b/HACKING.md
index 0a4d102e..5e9e4e76 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -98,6 +98,9 @@ The rules are mostly sorted in the alphabetical order.
  *  Prefer constants to variables where possible.  Reduce global variables.  Use
     [constant errors] instead of `errors.New`.
 
+ *  Program code lines should not be longer than one hundred (**100**) columns.
+    For comments, see the text section below.
+
  *  Unused arguments in anonymous functions must be called `_`:
 
     ```go
diff --git a/scripts/README.md b/scripts/README.md
index 1971f5cd..020a8444 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -108,6 +108,8 @@ Optional environment:
  *  `GO`: set an alternarive name for the Go compiler.
  *  `RACE`: set to `0` to not use the Go race detector.  The default value is
     `1`, use the race detector.
+ *  `TIMEOUT_FLAGS`: set timeout flags for tests.  The default value is
+    `--timeout 30s`.
  *  `VERBOSE`: verbosity level.  `1` shows every command that is run and every
     Go package that is processed.  `2` also shows subcommands.  The default
     value is `0`, don't be verbose.
diff --git a/scripts/make/go-test.sh b/scripts/make/go-test.sh
index 098b56d8..0654157e 100644
--- a/scripts/make/go-test.sh
+++ b/scripts/make/go-test.sh
@@ -32,10 +32,12 @@ else
 	race_flags='--race'
 fi
 
-go="${GO:-go}"
-cover_flags='--coverprofile ./coverage.txt'
-count_flags='--count 1'
+readonly go="${GO:-go}"
+readonly timeout_flags="${TIMEOUT_FLAGS:---timeout 30s}"
+readonly cover_flags='--coverprofile ./coverage.txt'
+readonly count_flags='--count 1'
 
 # Don't use quotes with flag variables because we want an empty space if
 # those aren't set.
-"$go" test $race_flags $count_flags $cover_flags $x_flags $v_flags ./...
+"$go" test $count_flags $cover_flags $race_flags $timeout_flags\
+	$x_flags $v_flags ./...