diff --git a/.golangci.yml b/.golangci.yml
index e1606a0..d067c69 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -20,4 +20,4 @@ linters-settings:
     list-type: whitelist
     packages:
       - github.com/mmcloughlin/avo
-      - golang.org/x/arch/x86
+      - golang.org/x/
diff --git a/script/bootstrap b/script/bootstrap
index 77cc9ca..79aaf8a 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -1,7 +1,9 @@
 #!/bin/bash -ex
 
-# We intend that the x86 arch sub-repo should be the only dependency.
-go get -v -u golang.org/x/arch/x86/...
+# Limit dependencies to golang.org/x repos
+go get -u \
+    golang.org/x/arch/x86/... \
+    golang.org/x/tools/go/...
 
 # Install golangci-lint
 golangci_lint_version='v1.12.3'