diff --git a/src/test/compile-fail/deriving-primitive.rs b/src/test/compile-fail/deriving-primitive.rs
index e8e37d880498..be822a173ab5 100644
--- a/src/test/compile-fail/deriving-primitive.rs
+++ b/src/test/compile-fail/deriving-primitive.rs
@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,27 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::num::FromPrimitive;
-use std::isize;
+#[derive(FromPrimitive)] //~ERROR `#[derive]` for custom traits is not stable
+enum Foo {}
 
-#[derive(FromPrimitive)]
-struct A { x: isize }
-//~^^ ERROR `FromPrimitive` cannot be derived for structs
-//~^^^ ERROR `FromPrimitive` cannot be derived for structs
+fn main() {}
 
-#[derive(FromPrimitive)]
-struct B(isize);
-//~^^ ERROR `FromPrimitive` cannot be derived for structs
-//~^^^ ERROR `FromPrimitive` cannot be derived for structs
-
-#[derive(FromPrimitive)]
-enum C { Foo(isize), Bar(usize) }
-//~^^ ERROR `FromPrimitive` cannot be derived for enums with non-unit variants
-//~^^^ ERROR `FromPrimitive` cannot be derived for enums with non-unit variants
-
-#[derive(FromPrimitive)]
-enum D { Baz { x: isize } }
-//~^^ ERROR `FromPrimitive` cannot be derived for enums with non-unit variants
-//~^^^ ERROR `FromPrimitive` cannot be derived for enums with non-unit variants
-
-pub fn main() {}