diff --git a/Library/Homebrew/completions/bash.erb b/Library/Homebrew/completions/bash.erb
index 9633149663..f862ab3b08 100644
--- a/Library/Homebrew/completions/bash.erb
+++ b/Library/Homebrew/completions/bash.erb
@@ -100,14 +100,14 @@ __brew_complete_outdated_casks() {
 
 __brew_complete_tapped() {
   local dir taps taplib
-  taplib="$(brew --repository)/Library/Taps"
+  taplib=${HOMEBREW_REPOSITORY:-$(brew --repository)}/Library/Taps
 
   for dir in "${taplib}"/*/*
   do
-    [[ -d "${dir}" ]] || continue
-    dir="${dir#"${taplib}"/}"
-    dir="${dir/homebrew-/}"
-    taps="${taps} ${dir}"
+    [[ -d ${dir} ]] || continue
+    dir=${dir#"${taplib}"/}
+    dir=${dir/homebrew-/}
+    taps+=" ${dir}"
   done
   __brewcomp "${taps}"
 }
diff --git a/completions/bash/brew b/completions/bash/brew
index e271633b15..eb6096f440 100644
--- a/completions/bash/brew
+++ b/completions/bash/brew
@@ -87,14 +87,14 @@ __brew_complete_outdated_casks() {
 
 __brew_complete_tapped() {
   local dir taps taplib
-  taplib="$(brew --repository)/Library/Taps"
+  taplib=${HOMEBREW_REPOSITORY:-$(brew --repository)}/Library/Taps
 
   for dir in "${taplib}"/*/*
   do
-    [[ -d "${dir}" ]] || continue
-    dir="${dir#"${taplib}"/}"
-    dir="${dir/homebrew-/}"
-    taps="${taps} ${dir}"
+    [[ -d ${dir} ]] || continue
+    dir=${dir#"${taplib}"/}
+    dir=${dir/homebrew-/}
+    taps+=" ${dir}"
   done
   __brewcomp "${taps}"
 }