diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index f659ccbe2507f..bbb17750f6aaa 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -250,6 +250,10 @@ pub fn prepare_tool_cargo(
         }
     }
 
+    // cargo doesn't set this env var yet, but it's needed by expect-test
+    // to build correct absolute paths for test_data files
+    cargo.env("CARGO_WORKSPACE_DIR", &dir);
+
     // clippy tests need to know about the stage sysroot. Set them consistently while building to
     // avoid rebuilding when running tests.
     cargo.env("SYSROOT", builder.sysroot(compiler));
diff --git a/src/tools/rust-analyzer b/src/tools/rust-analyzer
index 5342f47f42766..7d20ff3ffbd30 160000
--- a/src/tools/rust-analyzer
+++ b/src/tools/rust-analyzer
@@ -1 +1 @@
-Subproject commit 5342f47f4276641ddb5f0a5e08fb307742d6cdc4
+Subproject commit 7d20ff3ffbd30a89b7baa7cd996d4d60f0da6c55