diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index c36d0727d87..7d17a2ee186 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -485,7 +485,10 @@ def update_wpt():
         .with_max_run_time_minutes(5 * 60)
     )
     return (
-        with_homebrew(update_task, "etc/taskcluster/macos/Brewfile-wpt")
+        with_homebrew(update_task, [
+            "etc/taskcluster/macos/Brewfile-wpt",
+            "etc/taskcluster/macos/Brewfile-gstreamer",
+        ])
         .with_repo()
         .with_curl_artifact_script(build_task, "target.tar.gz")
         .with_script("""
@@ -515,7 +518,8 @@ def macos_wpt():
         .find_or_create("build.macos_x64_release." + CONFIG.git_sha)
     )
     def macos_run_task(name):
-        return macos_task(name).with_python2()
+        task = macos_task(name).with_python2()
+        return with_homebrew(task, ["etc/taskcluster/macos/Brewfile-gstreamer"])
     wpt_chunks("macOS x64", macos_run_task, build_task, repo_dir="repo",
                total_chunks=6, processes=4, chunks=[1,2,3])
 
@@ -730,15 +734,18 @@ def windows_build_task(name, package=True, arch="x86_64"):
     return task
 
 
-def with_homebrew(task, brewfile):
-        return task.with_script("""
+def with_homebrew(task, brewfiles):
+        task = task.with_script("""
             mkdir -p "$HOME/homebrew"
             export PATH="$HOME/homebrew/bin:$PATH"
             which brew || curl -L https://github.com/Homebrew/brew/tarball/master \
                 | tar xz --strip 1 -C "$HOME/homebrew"
-
-            time brew bundle install --no-upgrade --file={brewfile}
-        """.format(brewfile=brewfile))
+        """)
+        for brewfile in brewfiles:
+            task = task.with_script("""
+                time brew bundle install --no-upgrade --file={brewfile}
+            """.format(brewfile=brewfile))
+        return task
 
 
 def macos_build_task(name):
@@ -752,7 +759,10 @@ def macos_build_task(name):
         .with_rustup()
     )
     return (
-        with_homebrew(build_task, "etc/taskcluster/macos/Brewfile")
+        with_homebrew(build_task, [
+            "etc/taskcluster/macos/Brewfile",
+            "etc/taskcluster/macos/Brewfile-gstreamer",
+        ])
         .with_script("""
             export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include"
             export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib"
diff --git a/etc/taskcluster/macos/Brewfile b/etc/taskcluster/macos/Brewfile
index b9e6315d9a8..d13b3cfa678 100644
--- a/etc/taskcluster/macos/Brewfile
+++ b/etc/taskcluster/macos/Brewfile
@@ -3,12 +3,6 @@ brew "automake"
 brew "cmake"
 brew "openssl"
 brew "pkg-config"
-brew "gstreamer"
-brew "gst-plugins-base"
-brew "gst-libav"
-brew "gst-plugins-bad"
-brew "gst-plugins-good"
-brew "gst-rtsp-server"
 brew "llvm"
 brew "yasm"
 
diff --git a/etc/taskcluster/macos/Brewfile-gstreamer b/etc/taskcluster/macos/Brewfile-gstreamer
new file mode 100644
index 00000000000..a2fb6e035b2
--- /dev/null
+++ b/etc/taskcluster/macos/Brewfile-gstreamer
@@ -0,0 +1,6 @@
+brew "gstreamer"
+brew "gst-plugins-base"
+brew "gst-libav"
+brew "gst-plugins-bad"
+brew "gst-plugins-good"
+brew "gst-rtsp-server"