diff --git a/lib/bforest/src/lib.rs b/lib/bforest/src/lib.rs
index 7971d481d8..0fce1c11b6 100644
--- a/lib/bforest/src/lib.rs
+++ b/lib/bforest/src/lib.rs
@@ -158,7 +158,7 @@ fn slice_shift<T: Copy>(s: &mut [T], n: usize) {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::*;
     use entity::EntityRef;
 
diff --git a/lib/bforest/src/map.rs b/lib/bforest/src/map.rs
index 497ca2c112..636cee2df5 100644
--- a/lib/bforest/src/map.rs
+++ b/lib/bforest/src/map.rs
@@ -429,7 +429,7 @@ where
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::super::NodeData;
     use super::*;
     use std::mem;
diff --git a/lib/bforest/src/node.rs b/lib/bforest/src/node.rs
index de5337053d..768db40174 100644
--- a/lib/bforest/src/node.rs
+++ b/lib/bforest/src/node.rs
@@ -582,7 +582,7 @@ where
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::*;
     use std::mem;
     use std::string::ToString;
diff --git a/lib/bforest/src/path.rs b/lib/bforest/src/path.rs
index 153c487547..196094c241 100644
--- a/lib/bforest/src/path.rs
+++ b/lib/bforest/src/path.rs
@@ -703,7 +703,7 @@ impl<F: Forest> fmt::Display for Path<F> {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::super::{Forest, NodeData, NodePool};
     use super::*;
     use std::cmp::Ordering;
diff --git a/lib/bforest/src/set.rs b/lib/bforest/src/set.rs
index 911907ee61..cf4acdf9e3 100644
--- a/lib/bforest/src/set.rs
+++ b/lib/bforest/src/set.rs
@@ -357,7 +357,7 @@ where
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::super::NodeData;
     use super::*;
     use std::mem;
diff --git a/lib/codegen/src/dominator_tree.rs b/lib/codegen/src/dominator_tree.rs
index 2198fbf2bf..f8ca5d546c 100644
--- a/lib/codegen/src/dominator_tree.rs
+++ b/lib/codegen/src/dominator_tree.rs
@@ -666,7 +666,7 @@ impl DominatorTreePreorder {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::*;
     use cursor::{Cursor, FuncCursor};
     use flowgraph::ControlFlowGraph;
diff --git a/lib/codegen/src/ir/libcall.rs b/lib/codegen/src/ir/libcall.rs
index 6e749c72d6..61766dc8ae 100644
--- a/lib/codegen/src/ir/libcall.rs
+++ b/lib/codegen/src/ir/libcall.rs
@@ -190,7 +190,7 @@ fn make_funcref(libcall: LibCall, func: &mut Function, sig: Signature, isa: &Tar
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::*;
     use std::string::ToString;
 
diff --git a/lib/codegen/src/loop_analysis.rs b/lib/codegen/src/loop_analysis.rs
index ded382f3f7..21bf57f9aa 100644
--- a/lib/codegen/src/loop_analysis.rs
+++ b/lib/codegen/src/loop_analysis.rs
@@ -230,8 +230,7 @@ impl LoopAnalysis {
 }
 
 #[cfg(test)]
-mod test {
-
+mod tests {
     use cursor::{Cursor, FuncCursor};
     use dominator_tree::DominatorTree;
     use flowgraph::ControlFlowGraph;
diff --git a/lib/codegen/src/regalloc/virtregs.rs b/lib/codegen/src/regalloc/virtregs.rs
index 7d2b87153b..5d8992a179 100644
--- a/lib/codegen/src/regalloc/virtregs.rs
+++ b/lib/codegen/src/regalloc/virtregs.rs
@@ -396,7 +396,7 @@ impl VirtRegs {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::*;
     use entity::EntityRef;
     use ir::Value;
diff --git a/lib/codegen/src/timing.rs b/lib/codegen/src/timing.rs
index b340796578..e5327071c9 100644
--- a/lib/codegen/src/timing.rs
+++ b/lib/codegen/src/timing.rs
@@ -242,7 +242,7 @@ mod details {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::*;
     use std::string::ToString;
 
diff --git a/lib/codegen/src/topo_order.rs b/lib/codegen/src/topo_order.rs
index a43d0fcc93..aaedaf0e10 100644
--- a/lib/codegen/src/topo_order.rs
+++ b/lib/codegen/src/topo_order.rs
@@ -88,7 +88,7 @@ impl TopoOrder {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::*;
     use cursor::{Cursor, FuncCursor};
     use dominator_tree::DominatorTree;