diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index 9dd9a364b..1f9b2512d 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -177,7 +177,7 @@ pub mod non_expressive_names;
 pub mod ok_if_let;
 pub mod open_options;
 pub mod overflow_check_conditional;
-pub mod panic;
+pub mod panic_unimplemented;
 pub mod partialeq_ne_impl;
 pub mod precedence;
 pub mod ptr;
@@ -352,7 +352,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
     reg.register_late_lint_pass(box escape::Pass{too_large_for_stack: conf.too_large_for_stack});
     reg.register_early_lint_pass(box misc_early::MiscEarly);
     reg.register_late_lint_pass(box array_indexing::ArrayIndexing);
-    reg.register_late_lint_pass(box panic::Pass);
+    reg.register_late_lint_pass(box panic_unimplemented::Pass);
     reg.register_late_lint_pass(box strings::StringLitAsBytes);
     reg.register_late_lint_pass(box derive::Derive);
     reg.register_late_lint_pass(box types::CharLitAsU8);
@@ -626,8 +626,8 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         ok_if_let::IF_LET_SOME_RESULT,
         open_options::NONSENSICAL_OPEN_OPTIONS,
         overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL,
-        panic::PANIC_PARAMS,
-        panic::UNIMPLEMENTED,
+        panic_unimplemented::PANIC_PARAMS,
+        panic_unimplemented::UNIMPLEMENTED,
         partialeq_ne_impl::PARTIALEQ_NE_IMPL,
         precedence::PRECEDENCE,
         ptr::CMP_NULL,
@@ -749,8 +749,8 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         non_expressive_names::JUST_UNDERSCORES_AND_DIGITS,
         non_expressive_names::MANY_SINGLE_CHAR_NAMES,
         ok_if_let::IF_LET_SOME_RESULT,
-        panic::PANIC_PARAMS,
-        panic::UNIMPLEMENTED,
+        panic_unimplemented::PANIC_PARAMS,
+        panic_unimplemented::UNIMPLEMENTED,
         ptr::CMP_NULL,
         ptr::PTR_ARG,
         question_mark::QUESTION_MARK,
diff --git a/clippy_lints/src/panic.rs b/clippy_lints/src/panic_unimplemented.rs
similarity index 100%
rename from clippy_lints/src/panic.rs
rename to clippy_lints/src/panic_unimplemented.rs
diff --git a/tests/ui/panic.rs b/tests/ui/panic_unimplemented.rs
similarity index 100%
rename from tests/ui/panic.rs
rename to tests/ui/panic_unimplemented.rs
diff --git a/tests/ui/panic.stderr b/tests/ui/panic_unimplemented.stderr
similarity index 83%
rename from tests/ui/panic.stderr
rename to tests/ui/panic_unimplemented.stderr
index 786a20c03..534bfbae8 100644
--- a/tests/ui/panic.stderr
+++ b/tests/ui/panic_unimplemented.stderr
@@ -1,5 +1,5 @@
 error: you probably are missing some parameter in your format string
- --> $DIR/panic.rs:8:16
+ --> $DIR/panic_unimplemented.rs:8:16
   |
 8 |         panic!("{}");
   |                ^^^^
@@ -7,25 +7,25 @@ error: you probably are missing some parameter in your format string
   = note: `-D panic-params` implied by `-D warnings`
 
 error: you probably are missing some parameter in your format string
-  --> $DIR/panic.rs:10:16
+  --> $DIR/panic_unimplemented.rs:10:16
    |
 10 |         panic!("{:?}");
    |                ^^^^^^
 
 error: you probably are missing some parameter in your format string
-  --> $DIR/panic.rs:12:23
+  --> $DIR/panic_unimplemented.rs:12:23
    |
 12 |         assert!(true, "here be missing values: {}");
    |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: you probably are missing some parameter in your format string
-  --> $DIR/panic.rs:15:12
+  --> $DIR/panic_unimplemented.rs:15:12
    |
 15 |     panic!("{{{this}}}");
    |            ^^^^^^^^^^^^
 
 error: `unimplemented` should not be present in production code
-  --> $DIR/panic.rs:57:5
+  --> $DIR/panic_unimplemented.rs:57:5
    |
 57 |     unimplemented!();
    |     ^^^^^^^^^^^^^^^^^