diff --git a/tests/ui-windows/conf_bad_toml.rs b/tests/ui-windows/conf_bad_toml.rs
deleted file mode 100644
index 69ce68c25..000000000
--- a/tests/ui-windows/conf_bad_toml.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// error-pattern: error reading Clippy's configuration file
-
-#![feature(plugin)]
-#![plugin(clippy(conf_file="./tests/ui-windows/conf_bad_toml.toml"))]
-
-fn main() {}
diff --git a/tests/ui-windows/conf_bad_toml.stderr b/tests/ui-windows/conf_bad_toml.stderr
deleted file mode 100644
index f21ae524f..000000000
--- a/tests/ui-windows/conf_bad_toml.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-error: error reading Clippy's configuration file: The system cannot find the file specified. (os error 2)
-
-error: aborting due to previous error
-
diff --git a/tests/ui-windows/conf_bad_toml.toml b/tests/ui-windows/conf_bad_toml.toml
deleted file mode 100644
index 823e01a33..000000000
--- a/tests/ui-windows/conf_bad_toml.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-fn this_is_obviously(not: a, toml: file) {
-}
diff --git a/tests/ui-windows/conf_bad_type.rs b/tests/ui-windows/conf_bad_type.rs
deleted file mode 100644
index eaaac0ea8..000000000
--- a/tests/ui-windows/conf_bad_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// error-pattern: error reading Clippy's configuration file: `blacklisted-names` is expected to be a `Vec < String >` but is a `integer`
-
-#![feature(plugin)]
-#![plugin(clippy(conf_file="./tests/ui-windows/conf_bad_type.toml"))]
-
-fn main() {}
diff --git a/tests/ui-windows/conf_bad_type.stderr b/tests/ui-windows/conf_bad_type.stderr
deleted file mode 100644
index f21ae524f..000000000
--- a/tests/ui-windows/conf_bad_type.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-error: error reading Clippy's configuration file: The system cannot find the file specified. (os error 2)
-
-error: aborting due to previous error
-
diff --git a/tests/ui-windows/conf_bad_type.toml b/tests/ui-windows/conf_bad_type.toml
deleted file mode 100644
index 168675394..000000000
--- a/tests/ui-windows/conf_bad_type.toml
+++ /dev/null
@@ -1 +0,0 @@
-blacklisted-names = 42
diff --git a/tests/ui-posix/conf_bad_toml.rs b/tests/ui/conf_bad_toml.rs
similarity index 58%
rename from tests/ui-posix/conf_bad_toml.rs
rename to tests/ui/conf_bad_toml.rs
index d80a9c8ed..22cbfca75 100644
--- a/tests/ui-posix/conf_bad_toml.rs
+++ b/tests/ui/conf_bad_toml.rs
@@ -1,6 +1,6 @@
 // error-pattern: error reading Clippy's configuration file
 
 #![feature(plugin)]
-#![plugin(clippy(conf_file="./tests/ui-posix/conf_bad_toml.toml"))]
+#![plugin(clippy(conf_file="./tests/ui/conf_bad_toml.toml"))]
 
 fn main() {}
diff --git a/tests/ui-posix/conf_bad_toml.stderr b/tests/ui/conf_bad_toml.stderr
similarity index 100%
rename from tests/ui-posix/conf_bad_toml.stderr
rename to tests/ui/conf_bad_toml.stderr
diff --git a/tests/ui-posix/conf_bad_toml.toml b/tests/ui/conf_bad_toml.toml
similarity index 100%
rename from tests/ui-posix/conf_bad_toml.toml
rename to tests/ui/conf_bad_toml.toml
diff --git a/tests/ui-posix/conf_bad_type.rs b/tests/ui/conf_bad_type.rs
similarity index 71%
rename from tests/ui-posix/conf_bad_type.rs
rename to tests/ui/conf_bad_type.rs
index d77d30430..d5cca60a3 100644
--- a/tests/ui-posix/conf_bad_type.rs
+++ b/tests/ui/conf_bad_type.rs
@@ -1,6 +1,6 @@
 // error-pattern: error reading Clippy's configuration file: `blacklisted-names` is expected to be a `Vec < String >` but is a `integer`
 
 #![feature(plugin)]
-#![plugin(clippy(conf_file="./tests/ui-posix/conf_bad_type.toml"))]
+#![plugin(clippy(conf_file="./tests/ui/conf_bad_type.toml"))]
 
 fn main() {}
diff --git a/tests/ui-posix/conf_bad_type.stderr b/tests/ui/conf_bad_type.stderr
similarity index 100%
rename from tests/ui-posix/conf_bad_type.stderr
rename to tests/ui/conf_bad_type.stderr
diff --git a/tests/ui-posix/conf_bad_type.toml b/tests/ui/conf_bad_type.toml
similarity index 100%
rename from tests/ui-posix/conf_bad_type.toml
rename to tests/ui/conf_bad_type.toml