diff --git a/tests/aux/conf_french_blacklisted_name.toml b/tests/auxiliary/conf_french_blacklisted_name.toml
similarity index 100%
rename from tests/aux/conf_french_blacklisted_name.toml
rename to tests/auxiliary/conf_french_blacklisted_name.toml
diff --git a/tests/aux/conf_unknown_key.toml b/tests/auxiliary/conf_unknown_key.toml
similarity index 100%
rename from tests/aux/conf_unknown_key.toml
rename to tests/auxiliary/conf_unknown_key.toml
diff --git a/tests/aux/conf_whitelisted.toml b/tests/auxiliary/conf_whitelisted.toml
similarity index 100%
rename from tests/aux/conf_whitelisted.toml
rename to tests/auxiliary/conf_whitelisted.toml
diff --git a/tests/compile-fail/conf_french_blacklisted_name.rs b/tests/compile-fail/conf_french_blacklisted_name.rs
index 716b338e1a43..4c306a98b201 100644
--- a/tests/compile-fail/conf_french_blacklisted_name.rs
+++ b/tests/compile-fail/conf_french_blacklisted_name.rs
@@ -1,5 +1,5 @@
 #![feature(plugin)]
-#![plugin(clippy(conf_file="./tests/aux/conf_french_blacklisted_name.toml"))]
+#![plugin(clippy(conf_file="./tests/auxiliary/conf_french_blacklisted_name.toml"))]
 
 #![allow(dead_code)]
 #![allow(single_match)]
diff --git a/tests/compile-fail/conf_non_existant.rs b/tests/compile-fail/conf_non_existant.rs
index 0a31fb16147b..e287f7e02af9 100644
--- a/tests/compile-fail/conf_non_existant.rs
+++ b/tests/compile-fail/conf_non_existant.rs
@@ -1,6 +1,6 @@
 // error-pattern: error reading Clippy's configuration file
 
 #![feature(plugin)]
-#![plugin(clippy(conf_file="./tests/aux/non_existant_conf.toml"))]
+#![plugin(clippy(conf_file="./tests/auxiliary/non_existant_conf.toml"))]
 
 fn main() {}
diff --git a/tests/compile-fail/conf_unknown_key.rs b/tests/compile-fail/conf_unknown_key.rs
index e6041d8ed1c3..b5c1b240e4d1 100644
--- a/tests/compile-fail/conf_unknown_key.rs
+++ b/tests/compile-fail/conf_unknown_key.rs
@@ -1,6 +1,6 @@
 // error-pattern: error reading Clippy's configuration file: unknown key `foobar`
 
 #![feature(plugin)]
-#![plugin(clippy(conf_file="./tests/aux/conf_unknown_key.toml"))]
+#![plugin(clippy(conf_file="./tests/auxiliary/conf_unknown_key.toml"))]
 
 fn main() {}
diff --git a/tests/run-pass/conf_whitelisted.rs b/tests/run-pass/conf_whitelisted.rs
index 9b4bb4155d3f..1c82a010b3d4 100644
--- a/tests/run-pass/conf_whitelisted.rs
+++ b/tests/run-pass/conf_whitelisted.rs
@@ -1,4 +1,4 @@
 #![feature(plugin)]
-#![plugin(clippy(conf_file="./tests/aux/conf_whitelisted.toml"))]
+#![plugin(clippy(conf_file="./tests/auxiliary/conf_whitelisted.toml"))]
 
 fn main() {}