diff --git a/Restore.cmd b/Restore.cmd
index dba478a78eea3..422c17926f32f 100644
--- a/Restore.cmd
+++ b/Restore.cmd
@@ -1,4 +1,4 @@
-@echo off
+@if not defined EchoOn @echo off
 @setlocal enabledelayedexpansion
 
 set RoslynRoot=%~dp0
diff --git a/SetDevCommandPrompt.cmd b/SetDevCommandPrompt.cmd
index ad653379a61b0..b0056e43206aa 100644
--- a/SetDevCommandPrompt.cmd
+++ b/SetDevCommandPrompt.cmd
@@ -1,4 +1,4 @@
-@echo off
+@if not defined EchoOn @echo off
 
 :: Prefer building with Dev15 and try the simple route first (we may be running from a DevCmdPrompt already)
 set CommonToolsDir=%VS150COMNTOOLS%