diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index 2d14cc4776..3936b77f2f 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -93,12 +93,14 @@ begin
     internal_cmd ||= begin
       internal_dev_cmd = Commands.valid_internal_dev_cmd?(cmd)
       if internal_dev_cmd && !Homebrew::EnvConfig.developer?
-        opoo <<~MESSAGE if ENV["HOMEBREW_DEV_CMD_RUN"].blank?
-          #{Tty.bold}#{cmd}#{Tty.reset} is a developer command, so
-          Homebrew's developer mode has been automatically turned on.
-          To turn developer mode off, run #{Tty.bold}brew developer off#{Tty.reset}
+        if ENV["HOMEBREW_DEV_CMD_RUN"].blank? && ENV["HOMEBREW_TEST"].blank?
+          opoo <<~MESSAGE
+            #{Tty.bold}#{cmd}#{Tty.reset} is a developer command, so
+            Homebrew's developer mode has been automatically turned on.
+            To turn developer mode off, run #{Tty.bold}brew developer off#{Tty.reset}
 
-        MESSAGE
+          MESSAGE
+        end
 
         Homebrew::Settings.write "devcmdrun", true
         ENV["HOMEBREW_DEV_CMD_RUN"] = "1"
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 312a029742..b454a3f96b 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -645,7 +645,7 @@ elif [[ -f "${HOMEBREW_LIBRARY}/Homebrew/dev-cmd/${HOMEBREW_COMMAND}.sh" ]]
 then
   if [[ -z "${HOMEBREW_DEVELOPER}" ]]
   then
-    if [[ -z "${HOMEBREW_DEV_CMD_RUN}" ]]
+    if [[ -z "${HOMEBREW_DEV_CMD_RUN}" ]] && [[ -z "${HOMEBREW_TEST}" ]]
     then
       message="$(bold "${HOMEBREW_COMMAND}") is a developer command, so
 Homebrew's developer mode has been automatically turned on.
diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 63f8d4dc2e..df3d014350 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -87,6 +87,7 @@ module Homebrew
         ENV.delete(env)
       end
 
+      ENV["HOMEBREW_TEST"] = "1"
       ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
       ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat?
       ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic?