diff --git a/rust-version b/rust-version
index 514517267a0..c6a3130a5a4 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-89631663b7ad2d46d3e4f52bcfa7bee2be9eb82b
+cf9cf7c923eb01146971429044f216a3ca905e06
diff --git a/tests/compile-fail/check_arg_count_too_few_args.rs b/tests/compile-fail/check_arg_count_too_few_args.rs
index c6c19e042dd..f8d11832683 100644
--- a/tests/compile-fail/check_arg_count_too_few_args.rs
+++ b/tests/compile-fail/check_arg_count_too_few_args.rs
@@ -1,5 +1,4 @@
 #![feature(core_intrinsics)]
-#![feature(rustc_private)]
 
 fn main() {
     extern "C" {
diff --git a/tests/compile-fail/check_arg_count_too_many_args.rs b/tests/compile-fail/check_arg_count_too_many_args.rs
index cca03e53ec1..5163d223fa4 100644
--- a/tests/compile-fail/check_arg_count_too_many_args.rs
+++ b/tests/compile-fail/check_arg_count_too_many_args.rs
@@ -1,5 +1,4 @@
 #![feature(core_intrinsics)]
-#![feature(rustc_private)]
 
 fn main() {
     extern "C" {
diff --git a/tests/compile-fail/shim_arg_size.rs b/tests/compile-fail/shim_arg_size.rs
index dd8d6dac51d..556195d6e90 100644
--- a/tests/compile-fail/shim_arg_size.rs
+++ b/tests/compile-fail/shim_arg_size.rs
@@ -1,5 +1,3 @@
-#![feature(rustc_private)]
-
 fn main() {
     extern "C" {
         // Use the wrong type(ie. not the pointer width) for the `size`
diff --git a/tests/run-pass/btreemap.rs b/tests/run-pass/btreemap.rs
index e639ba6225c..ca548a03703 100644
--- a/tests/run-pass/btreemap.rs
+++ b/tests/run-pass/btreemap.rs
@@ -1,3 +1,5 @@
+// compile-flags: -Zmiri-track-raw-pointers
+// ignore-windows (FIXME: tracking raw pointers does not work on Windows)
 #![feature(btree_drain_filter)]
 use std::collections::{BTreeMap, BTreeSet};
 use std::mem;
diff --git a/tests/run-pass/calloc.rs b/tests/run-pass/calloc.rs
index 6793f86c116..9f614ce971b 100644
--- a/tests/run-pass/calloc.rs
+++ b/tests/run-pass/calloc.rs
@@ -2,10 +2,10 @@
 
 #![feature(rustc_private)]
 
-use core::slice;
-
 extern crate libc;
 
+use core::slice;
+
 fn main() {
     unsafe {
         let p1 = libc::calloc(0, 0);
diff --git a/tests/run-pass/concurrency/sync_singlethread.rs b/tests/run-pass/concurrency/sync_singlethread.rs
index 749db855e29..ab0203906d3 100644
--- a/tests/run-pass/concurrency/sync_singlethread.rs
+++ b/tests/run-pass/concurrency/sync_singlethread.rs
@@ -1,5 +1,3 @@
-#![feature(rustc_private, renamed_spin_loop)]
-
 use std::sync::{Mutex, TryLockError};
 use std::sync::atomic;
 use std::hint;
diff --git a/tests/run-pass/fs.rs b/tests/run-pass/fs.rs
index f74d1c9a36b..1261dbf1768 100644
--- a/tests/run-pass/fs.rs
+++ b/tests/run-pass/fs.rs
@@ -3,6 +3,8 @@
 
 #![feature(rustc_private)]
 
+extern crate libc;
+
 use std::fs::{
     File, create_dir, OpenOptions, read_dir, remove_dir, remove_dir_all, remove_file, rename,
 };
@@ -10,8 +12,6 @@ use std::ffi::CString;
 use std::io::{Read, Write, Error, ErrorKind, Result, Seek, SeekFrom};
 use std::path::{PathBuf, Path};
 
-extern crate libc;
-
 
 fn main() {
     test_file();
diff --git a/tests/run-pass/malloc.rs b/tests/run-pass/malloc.rs
index 8e0d9ac6293..b8eb7b50d34 100644
--- a/tests/run-pass/malloc.rs
+++ b/tests/run-pass/malloc.rs
@@ -2,10 +2,10 @@
 
 #![feature(rustc_private)]
 
-use core::{slice, ptr};
-
 extern crate libc;
 
+use core::{slice, ptr};
+
 fn main() {
     // Test that small allocations sometimes *are* not very aligned.
     let saw_unaligned = (0..64).any(|_| unsafe {
diff --git a/tests/run-pass/regions-mock-trans.rs b/tests/run-pass/regions-mock-trans.rs
index 0b2433d84fa..23ec91461db 100644
--- a/tests/run-pass/regions-mock-trans.rs
+++ b/tests/run-pass/regions-mock-trans.rs
@@ -3,6 +3,7 @@
 #![feature(rustc_private)]
 
 extern crate libc;
+
 use std::mem;
 
 struct Arena(());