diff --git a/appveyor.yml b/appveyor.yml
index 74ff7b057..d19cf14c6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ image: Visual Studio 2019
 install:
 - git submodule update --init --recursive
 - pwsh .\BuildTools\appveyor-install.ps1
-- dotnet tool install dotnet-format --tool-path tools
+- dotnet tool install dotnet-format --tool-path BuildTools
 
 nuget:
   account_feed: false
@@ -30,7 +30,7 @@ test_script:
 
 after_test:
 - python BuildTools\tidy.py
-- dotnet-format --check --verbosity diagnostic ILSpy.sln
+- .\BuildTools\dotnet-format --check --verbosity diagnostic ILSpy.sln
 
 for:
 - branches:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 57e08fe21..2d7358b36 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -50,7 +50,7 @@ jobs:
     inputs:
       command: 'custom'
       custom: 'tool'
-      arguments: 'install dotnet-format --tool-path tools'
+      arguments: 'install dotnet-format --tool-path BuildTools'
 
   - script: pwsh .\BuildTools\pipelines-install.ps1
     displayName: Install
@@ -92,12 +92,8 @@ jobs:
   - script: python BuildTools\tidy.py
     displayName: Tab check
 
-  - task: DotNetCoreCLI@2
+  - script: .\BuildTools\dotnet-format --check --verbosity diagnostic ILSpy.sln
     displayName: dotnet-format check
-    inputs:
-      command: 'custom'
-      custom: 'format'
-      arguments: '--check --verbosity diagnostic ILSpy.sln'
 
   - task: CopyFiles@2
     displayName: Move VSIX to publish directory