diff --git a/Makefile.in b/Makefile.in
index 5d476013612..7f1a6945d8a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -124,11 +124,6 @@ endif
 ifdef TRACE
   CFG_RUSTC_FLAGS += -Z trace
 endif
-ifndef DEBUG_BORROWS
-  RUSTFLAGS_STAGE0 += -Z no-debug-borrows
-  RUSTFLAGS_STAGE1 += -Z no-debug-borrows
-  RUSTFLAGS_STAGE2 += -Z no-debug-borrows
-endif
 
 # The executables crated during this compilation process have no need to include
 # static copies of libstd and libextra. We also generate dynamic versions of all
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 53a1e5697ef..4d8df829a94 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -104,7 +104,7 @@ fn runtest(test: &str, cratename: &str, libs: HashSet<Path>) {
         maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
         addl_lib_search_paths: @RefCell::new(libs),
         outputs: ~[session::OutputExecutable],
-        debugging_opts: session::prefer_dynamic,
+        debugging_opts: session::PREFER_DYNAMIC,
         .. (*session::basic_options()).clone()
     };