diff --git a/src/librustc_back/fs.rs b/src/librustc_back/fs.rs
index c051b8e60cd..756516d17a2 100644
--- a/src/librustc_back/fs.rs
+++ b/src/librustc_back/fs.rs
@@ -51,7 +51,7 @@ pub fn realpath(original: &Path) -> io::IoResult<Path> {
     return Ok(result);
 }
 
-#[cfg(not(windows), test)]
+#[cfg(all(not(windows), test))]
 mod test {
     use std::io;
     use std::io::fs::{File, symlink, mkdir, mkdir_recursive};
diff --git a/src/librustc_back/rpath.rs b/src/librustc_back/rpath.rs
index e0946366abc..abb594d6e47 100644
--- a/src/librustc_back/rpath.rs
+++ b/src/librustc_back/rpath.rs
@@ -147,7 +147,7 @@ fn minimize_rpaths(rpaths: &[String]) -> Vec<String> {
     minimized
 }
 
-#[cfg(unix, test)]
+#[cfg(all(unix, test))]
 mod test {
     use super::{RPathConfig};
     use super::{minimize_rpaths, rpaths_to_flags, get_rpath_relative_to_output};