diff --git a/clang-tools-extra/clangd/CollectMacros.cpp b/clang-tools-extra/clangd/CollectMacros.cpp
--- a/clang-tools-extra/clangd/CollectMacros.cpp
+++ b/clang-tools-extra/clangd/CollectMacros.cpp
@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "CollectMacros.h"
-#include "clang/Basic/SourceLocation.h"
 #include "clang/Lex/Lexer.h"
+#include "clang/Basic/SourceLocation.h"
 
 namespace clang {
 namespace clangd {
diff --git a/clang-tools-extra/clangd/test/test-uri-posix.test b/clang-tools-extra/clangd/test/test-uri-posix.test
--- a/clang-tools-extra/clangd/test/test-uri-posix.test
+++ b/clang-tools-extra/clangd/test/test-uri-posix.test
@@ -4,7 +4,7 @@
 {"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}}
 ---
 {"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"test:///foo.c","languageId":"c","version":1,"text":"void main() {}"}}}
-# CHECK:    "uri": "file:///clangd-test/foo.c"
+# CHECK:    "uri": "file:///clangd-test/baz.c"
 ---
 {"jsonrpc":"2.0","id":5,"method":"shutdown"}
 ---
diff --git a/clang-tools-extra/clangd/test/test-uri-windows.test b/clang-tools-extra/clangd/test/test-uri-windows.test
--- a/clang-tools-extra/clangd/test/test-uri-windows.test
+++ b/clang-tools-extra/clangd/test/test-uri-windows.test
@@ -4,7 +4,7 @@
 {"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}}
 ---
 {"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"test:///foo.c","languageId":"c","version":1,"text":"void main() {}"}}}
-# CHECK:    "uri": "file:///C:/clangd-test/foo.c"
+# CHECK:    "uri": "file:///C:/clangd-test/bar.c"
 ---
 {"jsonrpc":"2.0","id":5,"method":"shutdown"}
 ---