diff --git a/Library/Homebrew/extend/os/mac/system_config.rb b/Library/Homebrew/extend/os/mac/system_config.rb
index a44497b38a..89989aa750 100644
--- a/Library/Homebrew/extend/os/mac/system_config.rb
+++ b/Library/Homebrew/extend/os/mac/system_config.rb
@@ -57,11 +57,9 @@ class SystemConfig
       dump_generic_verbose_config(f)
       f.puts "macOS: #{MacOS.full_version}-#{kernel}"
       f.puts "CLT: #{clt || "N/A"}"
-      if MacOS::CLT.separate_header_package?
-        f.puts "CLT headers: #{clt_headers || "N/A"}"
-      end
       f.puts "Xcode: #{xcode || "N/A"}"
-      f.puts "XQuartz: #{xquartz || "N/A"}"
+      f.puts "CLT headers: #{clt_headers}" if MacOS::CLT.separate_header_package? && clt_headers
+      f.puts "XQuartz: #{xquartz}" if !MacOS::XQuartz.provided_by_apple? && xquartz
     end
   end
 end
diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index 6c65d9e676..23cdbffcef 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -196,7 +196,7 @@ class SystemConfig
       end
       f.puts "Git: #{describe_git}"
       f.puts "Curl: #{describe_curl}"
-      f.puts "Java: #{describe_java}"
+      f.puts "Java: #{describe_java}" if describe_java != "N/A"
     end
     alias dump_generic_verbose_config dump_verbose_config
   end