diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 5c8034d53e3..05403cf48c7 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -289,8 +289,6 @@ impl Step for Cargo {
         // Don't run cross-compile tests, we may not have cross-compiled libstd libs
         // available.
         cargo.env("CFG_DISABLE_CROSS_TESTS", "1");
-        // Disable a test that has issues with mingw.
-        cargo.env("CARGO_TEST_DISABLE_GIT_CLI", "1");
         // Forcibly disable tests using nightly features since any changes to
         // those features won't be able to land.
         cargo.env("CARGO_TEST_DISABLE_NIGHTLY", "1");
diff --git a/src/tools/cargo b/src/tools/cargo
index 85b500ccad8..4fd148c47e7 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 85b500ccad8cd0b63995fd94a03ddd4b83f7905b
+Subproject commit 4fd148c47e733770c537efac5220744945d572ef
diff --git a/src/tools/rls b/src/tools/rls
index fcf1f94c9ab..4d8b0a19986 160000
--- a/src/tools/rls
+++ b/src/tools/rls
@@ -1 +1 @@
-Subproject commit fcf1f94c9ab2acc18cfd4368a4aeb38e77da9649
+Subproject commit 4d8b0a19986a4daab37287a5b5fe2da0775d1873