diff --git a/tests/compile-fail/conf_french_blacklisted_name.toml b/tests/aux/conf_french_blacklisted_name.toml
similarity index 100%
rename from tests/compile-fail/conf_french_blacklisted_name.toml
rename to tests/aux/conf_french_blacklisted_name.toml
diff --git a/tests/compile-fail/conf_unknown_key.toml b/tests/aux/conf_unknown_key.toml
similarity index 100%
rename from tests/compile-fail/conf_unknown_key.toml
rename to tests/aux/conf_unknown_key.toml
diff --git a/tests/run-pass/conf_unknown_key.toml b/tests/aux/conf_whitelisted.toml
similarity index 100%
rename from tests/run-pass/conf_unknown_key.toml
rename to tests/aux/conf_whitelisted.toml
diff --git a/tests/compile-fail/conf_french_blacklisted_name.rs b/tests/compile-fail/conf_french_blacklisted_name.rs
index b7e29eeef1f7..716b338e1a43 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/compile-fail/conf_french_blacklisted_name.toml"))]
+#![plugin(clippy(conf_file="./tests/aux/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 cf1024705caf..0a31fb16147b 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/compile-fail/non_existant_conf.toml"))]
+#![plugin(clippy(conf_file="./tests/aux/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 02131d94d527..e6041d8ed1c3 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/compile-fail/conf_unknown_key.toml"))]
+#![plugin(clippy(conf_file="./tests/aux/conf_unknown_key.toml"))]
 
 fn main() {}
diff --git a/tests/run-pass/conf_unknown_key.rs b/tests/run-pass/conf_unknown_key.rs
deleted file mode 100644
index bb186d476300..000000000000
--- a/tests/run-pass/conf_unknown_key.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#![feature(plugin)]
-#![plugin(clippy(conf_file="./tests/run-pass/conf_unknown_key.toml"))]
-
-fn main() {}
diff --git a/tests/run-pass/conf_whitelisted.rs b/tests/run-pass/conf_whitelisted.rs
new file mode 100644
index 000000000000..9b4bb4155d3f
--- /dev/null
+++ b/tests/run-pass/conf_whitelisted.rs
@@ -0,0 +1,4 @@
+#![feature(plugin)]
+#![plugin(clippy(conf_file="./tests/aux/conf_whitelisted.toml"))]
+
+fn main() {}