diff --git a/src/test/run-fail/args-fail.rs b/src/test/run-fail/args-panic.rs
similarity index 100%
rename from src/test/run-fail/args-fail.rs
rename to src/test/run-fail/args-panic.rs
diff --git a/src/test/run-fail/assert-eq-macro-fail.rs b/src/test/run-fail/assert-eq-macro-panic.rs
similarity index 100%
rename from src/test/run-fail/assert-eq-macro-fail.rs
rename to src/test/run-fail/assert-eq-macro-panic.rs
diff --git a/src/test/run-fail/binop-fail.rs b/src/test/run-fail/binop-panic.rs
similarity index 100%
rename from src/test/run-fail/binop-fail.rs
rename to src/test/run-fail/binop-panic.rs
diff --git a/src/test/run-fail/doublefail.rs b/src/test/run-fail/doublepanic.rs
similarity index 100%
rename from src/test/run-fail/doublefail.rs
rename to src/test/run-fail/doublepanic.rs
diff --git a/src/test/run-fail/explicit-fail-msg.rs b/src/test/run-fail/explicit-panic-msg.rs
similarity index 100%
rename from src/test/run-fail/explicit-fail-msg.rs
rename to src/test/run-fail/explicit-panic-msg.rs
diff --git a/src/test/run-fail/explicit-fail.rs b/src/test/run-fail/explicit-panic.rs
similarity index 100%
rename from src/test/run-fail/explicit-fail.rs
rename to src/test/run-fail/explicit-panic.rs
diff --git a/src/test/run-fail/expr-fn-fail.rs b/src/test/run-fail/expr-fn-panic.rs
similarity index 100%
rename from src/test/run-fail/expr-fn-fail.rs
rename to src/test/run-fail/expr-fn-panic.rs
diff --git a/src/test/run-fail/expr-if-fail-fn.rs b/src/test/run-fail/expr-if-panic-fn.rs
similarity index 100%
rename from src/test/run-fail/expr-if-fail-fn.rs
rename to src/test/run-fail/expr-if-panic-fn.rs
diff --git a/src/test/run-fail/expr-if-fail.rs b/src/test/run-fail/expr-if-panic.rs
similarity index 100%
rename from src/test/run-fail/expr-if-fail.rs
rename to src/test/run-fail/expr-if-panic.rs
diff --git a/src/test/run-fail/expr-match-fail-fn.rs b/src/test/run-fail/expr-match-panic-fn.rs
similarity index 100%
rename from src/test/run-fail/expr-match-fail-fn.rs
rename to src/test/run-fail/expr-match-panic-fn.rs
diff --git a/src/test/run-fail/expr-match-fail.rs b/src/test/run-fail/expr-match-panic.rs
similarity index 100%
rename from src/test/run-fail/expr-match-fail.rs
rename to src/test/run-fail/expr-match-panic.rs
diff --git a/src/test/run-fail/extern-fail.rs b/src/test/run-fail/extern-panic.rs
similarity index 100%
rename from src/test/run-fail/extern-fail.rs
rename to src/test/run-fail/extern-panic.rs
diff --git a/src/test/run-fail/fmt-fail.rs b/src/test/run-fail/fmt-panic.rs
similarity index 100%
rename from src/test/run-fail/fmt-fail.rs
rename to src/test/run-fail/fmt-panic.rs
diff --git a/src/test/run-fail/for-each-loop-fail.rs b/src/test/run-fail/for-each-loop-panic.rs
similarity index 100%
rename from src/test/run-fail/for-each-loop-fail.rs
rename to src/test/run-fail/for-each-loop-panic.rs
diff --git a/src/test/run-fail/if-check-fail.rs b/src/test/run-fail/if-check-panic.rs
similarity index 100%
rename from src/test/run-fail/if-check-fail.rs
rename to src/test/run-fail/if-check-panic.rs
diff --git a/src/test/run-fail/main-fail.rs b/src/test/run-fail/main-panic.rs
similarity index 100%
rename from src/test/run-fail/main-fail.rs
rename to src/test/run-fail/main-panic.rs
diff --git a/src/test/run-fail/match-bot-fail.rs b/src/test/run-fail/match-bot-panic.rs
similarity index 100%
rename from src/test/run-fail/match-bot-fail.rs
rename to src/test/run-fail/match-bot-panic.rs
diff --git a/src/test/run-fail/native-failure.rs b/src/test/run-fail/native-panic.rs
similarity index 100%
rename from src/test/run-fail/native-failure.rs
rename to src/test/run-fail/native-panic.rs
diff --git a/src/test/run-fail/fail-arg.rs b/src/test/run-fail/panic-arg.rs
similarity index 100%
rename from src/test/run-fail/fail-arg.rs
rename to src/test/run-fail/panic-arg.rs
diff --git a/src/test/run-fail/fail-macro-any-wrapped.rs b/src/test/run-fail/panic-macro-any-wrapped.rs
similarity index 100%
rename from src/test/run-fail/fail-macro-any-wrapped.rs
rename to src/test/run-fail/panic-macro-any-wrapped.rs
diff --git a/src/test/run-fail/fail-macro-any.rs b/src/test/run-fail/panic-macro-any.rs
similarity index 100%
rename from src/test/run-fail/fail-macro-any.rs
rename to src/test/run-fail/panic-macro-any.rs
diff --git a/src/test/run-fail/fail-macro-explicit.rs b/src/test/run-fail/panic-macro-explicit.rs
similarity index 100%
rename from src/test/run-fail/fail-macro-explicit.rs
rename to src/test/run-fail/panic-macro-explicit.rs
diff --git a/src/test/run-fail/fail-macro-fmt.rs b/src/test/run-fail/panic-macro-fmt.rs
similarity index 100%
rename from src/test/run-fail/fail-macro-fmt.rs
rename to src/test/run-fail/panic-macro-fmt.rs
diff --git a/src/test/run-fail/fail-macro-owned.rs b/src/test/run-fail/panic-macro-owned.rs
similarity index 100%
rename from src/test/run-fail/fail-macro-owned.rs
rename to src/test/run-fail/panic-macro-owned.rs
diff --git a/src/test/run-fail/fail-macro-static.rs b/src/test/run-fail/panic-macro-static.rs
similarity index 100%
rename from src/test/run-fail/fail-macro-static.rs
rename to src/test/run-fail/panic-macro-static.rs
diff --git a/src/test/run-fail/fail-main.rs b/src/test/run-fail/panic-main.rs
similarity index 100%
rename from src/test/run-fail/fail-main.rs
rename to src/test/run-fail/panic-main.rs
diff --git a/src/test/run-fail/fail-non-utf8.rs b/src/test/run-fail/panic-non-utf8.rs
similarity index 100%
rename from src/test/run-fail/fail-non-utf8.rs
rename to src/test/run-fail/panic-non-utf8.rs
diff --git a/src/test/run-fail/fail-parens.rs b/src/test/run-fail/panic-parens.rs
similarity index 100%
rename from src/test/run-fail/fail-parens.rs
rename to src/test/run-fail/panic-parens.rs
diff --git a/src/test/run-fail/fail-task-name-none.rs b/src/test/run-fail/panic-task-name-none.rs
similarity index 100%
rename from src/test/run-fail/fail-task-name-none.rs
rename to src/test/run-fail/panic-task-name-none.rs
diff --git a/src/test/run-fail/fail-task-name-owned.rs b/src/test/run-fail/panic-task-name-owned.rs
similarity index 100%
rename from src/test/run-fail/fail-task-name-owned.rs
rename to src/test/run-fail/panic-task-name-owned.rs
diff --git a/src/test/run-fail/fail-task-name-send-str.rs b/src/test/run-fail/panic-task-name-send-str.rs
similarity index 100%
rename from src/test/run-fail/fail-task-name-send-str.rs
rename to src/test/run-fail/panic-task-name-send-str.rs
diff --git a/src/test/run-fail/fail-task-name-static.rs b/src/test/run-fail/panic-task-name-static.rs
similarity index 100%
rename from src/test/run-fail/fail-task-name-static.rs
rename to src/test/run-fail/panic-task-name-static.rs
diff --git a/src/test/run-fail/fail.rs b/src/test/run-fail/panic.rs
similarity index 100%
rename from src/test/run-fail/fail.rs
rename to src/test/run-fail/panic.rs
diff --git a/src/test/run-fail/result-get-fail.rs b/src/test/run-fail/result-get-panic.rs
similarity index 100%
rename from src/test/run-fail/result-get-fail.rs
rename to src/test/run-fail/result-get-panic.rs
diff --git a/src/test/run-fail/rt-set-exit-status-fail.rs b/src/test/run-fail/rt-set-exit-status-panic.rs
similarity index 100%
rename from src/test/run-fail/rt-set-exit-status-fail.rs
rename to src/test/run-fail/rt-set-exit-status-panic.rs
diff --git a/src/test/run-fail/rt-set-exit-status-fail2.rs b/src/test/run-fail/rt-set-exit-status-panic2.rs
similarity index 100%
rename from src/test/run-fail/rt-set-exit-status-fail2.rs
rename to src/test/run-fail/rt-set-exit-status-panic2.rs
diff --git a/src/test/run-fail/test-fail.rs b/src/test/run-fail/test-panic.rs
similarity index 100%
rename from src/test/run-fail/test-fail.rs
rename to src/test/run-fail/test-panic.rs
diff --git a/src/test/run-fail/unimplemented-macro-fail.rs b/src/test/run-fail/unimplemented-macro-panic.rs
similarity index 100%
rename from src/test/run-fail/unimplemented-macro-fail.rs
rename to src/test/run-fail/unimplemented-macro-panic.rs
diff --git a/src/test/run-fail/unique-fail.rs b/src/test/run-fail/unique-panic.rs
similarity index 100%
rename from src/test/run-fail/unique-fail.rs
rename to src/test/run-fail/unique-panic.rs
diff --git a/src/test/run-fail/unreachable-macro-fail.rs b/src/test/run-fail/unreachable-macro-panic.rs
similarity index 100%
rename from src/test/run-fail/unreachable-macro-fail.rs
rename to src/test/run-fail/unreachable-macro-panic.rs
diff --git a/src/test/run-fail/while-body-fails.rs b/src/test/run-fail/while-body-panics.rs
similarity index 100%
rename from src/test/run-fail/while-body-fails.rs
rename to src/test/run-fail/while-body-panics.rs
diff --git a/src/test/run-fail/while-fail.rs b/src/test/run-fail/while-panic.rs
similarity index 100%
rename from src/test/run-fail/while-fail.rs
rename to src/test/run-fail/while-panic.rs
diff --git a/src/test/run-pass/expr-if-fail-all.rs b/src/test/run-pass/expr-if-panic-all.rs
similarity index 100%
rename from src/test/run-pass/expr-if-fail-all.rs
rename to src/test/run-pass/expr-if-panic-all.rs
diff --git a/src/test/run-pass/expr-if-fail.rs b/src/test/run-pass/expr-if-panic.rs
similarity index 100%
rename from src/test/run-pass/expr-if-fail.rs
rename to src/test/run-pass/expr-if-panic.rs
diff --git a/src/test/run-pass/expr-match-fail-all.rs b/src/test/run-pass/expr-match-panic-all.rs
similarity index 100%
rename from src/test/run-pass/expr-match-fail-all.rs
rename to src/test/run-pass/expr-match-panic-all.rs
diff --git a/src/test/run-pass/expr-match-fail.rs b/src/test/run-pass/expr-match-panic.rs
similarity index 100%
rename from src/test/run-pass/expr-match-fail.rs
rename to src/test/run-pass/expr-match-panic.rs
diff --git a/src/test/run-pass/for-loop-fail.rs b/src/test/run-pass/for-loop-panic.rs
similarity index 100%
rename from src/test/run-pass/for-loop-fail.rs
rename to src/test/run-pass/for-loop-panic.rs
diff --git a/src/test/run-pass/fail-during-tld-destroy.rs b/src/test/run-pass/panic-during-tld-destroy.rs
similarity index 100%
rename from src/test/run-pass/fail-during-tld-destroy.rs
rename to src/test/run-pass/panic-during-tld-destroy.rs
diff --git a/src/test/run-pass/fail-in-dtor-drops-fields.rs b/src/test/run-pass/panic-in-dtor-drops-fields.rs
similarity index 100%
rename from src/test/run-pass/fail-in-dtor-drops-fields.rs
rename to src/test/run-pass/panic-in-dtor-drops-fields.rs
diff --git a/src/test/run-pass/parse-fail.rs b/src/test/run-pass/parse-panic.rs
similarity index 100%
rename from src/test/run-pass/parse-fail.rs
rename to src/test/run-pass/parse-panic.rs
diff --git a/src/test/run-pass/slice-fail-1.rs b/src/test/run-pass/slice-panic-1.rs
similarity index 100%
rename from src/test/run-pass/slice-fail-1.rs
rename to src/test/run-pass/slice-panic-1.rs
diff --git a/src/test/run-pass/slice-fail-2.rs b/src/test/run-pass/slice-panic-2.rs
similarity index 100%
rename from src/test/run-pass/slice-fail-2.rs
rename to src/test/run-pass/slice-panic-2.rs
diff --git a/src/test/run-pass/vector-sort-failure-safe.rs b/src/test/run-pass/vector-sort-panic-safe.rs
similarity index 100%
rename from src/test/run-pass/vector-sort-failure-safe.rs
rename to src/test/run-pass/vector-sort-panic-safe.rs