diff --git a/completions/bash/brew b/completions/bash/brew
index 3f58cfd9478eb..2f7fffed8ec0e 100644
--- a/completions/bash/brew
+++ b/completions/bash/brew
@@ -2345,6 +2345,7 @@ _brew_tc() {
       ;;
     *) ;;
   esac
+  __brew_complete_tapped
 }
 
 _brew_test() {
@@ -2414,6 +2415,7 @@ _brew_typecheck() {
       ;;
     *) ;;
   esac
+  __brew_complete_tapped
 }
 
 _brew_unbottled() {
diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish
index acd4a3bfcd750..736e6c2390977 100644
--- a/completions/fish/brew.fish
+++ b/completions/fish/brew.fish
@@ -1534,6 +1534,7 @@ __fish_brew_complete_arg 'tc' -l suggest-typed -d 'Try upgrading `typed` sigils'
 __fish_brew_complete_arg 'tc' -l update -d 'Update RBI files'
 __fish_brew_complete_arg 'tc' -l update-all -d 'Update all RBI files rather than just updated gems'
 __fish_brew_complete_arg 'tc' -l verbose -d 'Make some output more verbose'
+__fish_brew_complete_arg 'tc' -a '(__fish_brew_suggest_taps_installed)'
 
 
 __fish_brew_complete_cmd 'test' 'Run the test method provided by an installed formula'
@@ -1576,6 +1577,7 @@ __fish_brew_complete_arg 'typecheck' -l suggest-typed -d 'Try upgrading `typed`
 __fish_brew_complete_arg 'typecheck' -l update -d 'Update RBI files'
 __fish_brew_complete_arg 'typecheck' -l update-all -d 'Update all RBI files rather than just updated gems'
 __fish_brew_complete_arg 'typecheck' -l verbose -d 'Make some output more verbose'
+__fish_brew_complete_arg 'typecheck' -a '(__fish_brew_suggest_taps_installed)'
 
 
 __fish_brew_complete_cmd 'unbottled' 'Show the unbottled dependents of formulae'
diff --git a/completions/zsh/_brew b/completions/zsh/_brew
index b4bc34e8f7ee7..7c27a86a95c27 100644
--- a/completions/zsh/_brew
+++ b/completions/zsh/_brew
@@ -1902,7 +1902,9 @@ _brew_tc() {
     '--suggest-typed[Try upgrading `typed` sigils]' \
     '(--lsp)--update[Update RBI files]' \
     '(--lsp)--update-all[Update all RBI files rather than just updated gems]' \
-    '--verbose[Make some output more verbose]'
+    '--verbose[Make some output more verbose]' \
+    - tap \
+    '*::tap:__brew_any_tap'
 }
 
 # brew test
@@ -1951,7 +1953,9 @@ _brew_typecheck() {
     '--suggest-typed[Try upgrading `typed` sigils]' \
     '(--lsp)--update[Update RBI files]' \
     '(--lsp)--update-all[Update all RBI files rather than just updated gems]' \
-    '--verbose[Make some output more verbose]'
+    '--verbose[Make some output more verbose]' \
+    - tap \
+    '*::tap:__brew_any_tap'
 }
 
 # brew unbottled
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 54a2aab37671c..b838e67b4b6ad 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -2762,7 +2762,7 @@ Run Homebrew's unit and integration tests.
 
 : Randomise tests with the specified *`value`* instead of a random seed.
 
-### `typecheck`, `tc` \[*`options`*\]
+### `typecheck`, `tc` \[*`options`*\] \[*`tap`* ...\]
 
 Check for typechecking errors using Sorbet.
 
diff --git a/manpages/brew.1 b/manpages/brew.1
index f5e99308a1ddb..0ccb848bc93de 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1764,7 +1764,7 @@ Run the test suite serially to find the \fIn\fP slowest tests\.
 .TP
 \fB\-\-seed\fP
 Randomise tests with the specified \fIvalue\fP instead of a random seed\.
-.SS "\fBtypecheck\fP, \fBtc\fP \fR[\fIoptions\fP]"
+.SS "\fBtypecheck\fP, \fBtc\fP \fR[\fIoptions\fP] \fR[\fItap\fP \.\.\.]"
 Check for typechecking errors using Sorbet\.
 .TP
 \fB\-\-fix\fP