diff --git a/src/test/run-pass-fulldeps/auxiliary/issue_16723_multiple_items_syntax_ext.rs b/src/test/run-pass-fulldeps/auxiliary/issue-16723.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/auxiliary/issue_16723_multiple_items_syntax_ext.rs
rename to src/test/run-pass-fulldeps/auxiliary/issue-16723.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/plugin_crate_outlive_expansion_phase.rs b/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs
similarity index 100%
rename from src/test/run-pass-fulldeps/auxiliary/plugin_crate_outlive_expansion_phase.rs
rename to src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs
diff --git a/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs b/src/test/run-pass-fulldeps/issue-16723.rs
similarity index 86%
rename from src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs
rename to src/test/run-pass-fulldeps/issue-16723.rs
index c1ffeb7c8e2..bacfa8d1ead 100644
--- a/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs
+++ b/src/test/run-pass-fulldeps/issue-16723.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // ignore-stage1
-// aux-build:issue_16723_multiple_items_syntax_ext.rs
+// aux-build:issue-16723.rs
 #![feature(plugin)]
-#![plugin(issue_16723_multiple_items_syntax_ext)]
+#![plugin(issue_16723)]
 
 multiple_items!();
 
diff --git a/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs b/src/test/run-pass-fulldeps/outlive-expansion-phase.rs
similarity index 83%
rename from src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs
rename to src/test/run-pass-fulldeps/outlive-expansion-phase.rs
index 9573d0c8c40..6eb3e510724 100644
--- a/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs
+++ b/src/test/run-pass-fulldeps/outlive-expansion-phase.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:plugin_crate_outlive_expansion_phase.rs
+// aux-build:outlive-expansion-phase.rs
 // ignore-stage1
 
 #![feature(plugin)]
-#![plugin(plugin_crate_outlive_expansion_phase)]
+#![plugin(outlive_expansion_phase)]
 
 pub fn main() {}
diff --git a/src/test/run-pass/specialization/auxiliary/specialization_cross_crate_defaults.rs b/src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs
similarity index 100%
rename from src/test/run-pass/specialization/auxiliary/specialization_cross_crate_defaults.rs
rename to src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs
diff --git a/src/test/run-pass/specialization/specialization-cross-crate-defaults.rs b/src/test/run-pass/specialization/cross-crate-defaults.rs
similarity index 87%
rename from src/test/run-pass/specialization/specialization-cross-crate-defaults.rs
rename to src/test/run-pass/specialization/cross-crate-defaults.rs
index 62c7e3e2e44..132520dcb73 100644
--- a/src/test/run-pass/specialization/specialization-cross-crate-defaults.rs
+++ b/src/test/run-pass/specialization/cross-crate-defaults.rs
@@ -8,13 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:specialization_cross_crate_defaults.rs
+// aux-build:cross_crates_defaults.rs
 
 #![feature(specialization)]
 
-extern crate specialization_cross_crate_defaults;
+extern crate cross_crates_defaults;
 
-use specialization_cross_crate_defaults::*;
+use cross_crates_defaults::*;
 
 struct LocalDefault;
 struct LocalOverride;