diff --git a/.travis.yml b/.travis.yml
index 9a8b8068900..ba3b8d36399 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,13 @@ script:
   cargo test --release --all-features &&
   cargo install --all-features --force --path .
 - |
-  # Get ourselves a MIR-full libstd
+  # Get ourselves a MIR-full libstd, and use it henceforth
   cargo miri setup &&
-  export MIRI_SYSROOT=~/.miri/HOST
+  if [ "$TRAVIS_OS_NAME" == osx ]; then
+    export MIRI_SYSROOT=~/Library/Caches/miri.miri.miri/HOST
+  else
+    export MIRI_SYSROOT=~/.cache/miri/HOST
+  fi
 - |
   # Test miri with full MIR
   cargo test --release --all-features
diff --git a/README.md b/README.md
index d33b92f6de4..d6e0be40cac 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ Miri builds and vice-versa.
 
 You may be running `cargo miri` with a different compiler version than the one
 used to build the custom libstd that Miri uses, and Miri failed to detect that.
-Try deleting `~/.miri`.
+Try deleting `~/.cache/miri`.
 
 ## Miri `-Z` flags
 
diff --git a/appveyor.yml b/appveyor.yml
index 4287a08613f..1f38b848c00 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,9 +30,9 @@ test_script:
     # Test plain miri
     - cargo build --release --all-features --all-targets
     - cargo test --release --all-features
-    # Get ourselves a MIR-full libstd
+    # Get ourselves a MIR-full libstd, and use it henceforth
     - cargo run --release --all-features --bin cargo-miri -- miri setup
-    - set MIRI_SYSROOT=%USERPROFILE%\.miri\HOST
+    - set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\miri\miri\cache\HOST
     # Test miri with full MIR
     - cargo test --release --all-features