diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index 78b1a08..db39a45 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -25,7 +25,6 @@ pub fn from_primitive(input: TokenStream) -> TokenStream {
     let source = input.to_string();
 
     let ast = syn::parse_item(&source).unwrap();
-    // panic!("{:?}", ast);
 
 macro_rules! pathvec_std {
     ($cx:expr, $first:ident :: $($rest:ident)::+) => ({
diff --git a/macros/tests/test_macro.rs b/macros/tests/trivial.rs
similarity index 95%
rename from macros/tests/test_macro.rs
rename to macros/tests/trivial.rs
index 1245266..709fc2c 100644
--- a/macros/tests/test_macro.rs
+++ b/macros/tests/trivial.rs
@@ -22,7 +22,7 @@ enum Color {
 }
 
 #[test]
-fn test_from_primitive() {
+fn test_from_primitive_for_trivial_case() {
     let v: [Option<Color>; 4] = [num::FromPrimitive::from_u64(0),
                                  num::FromPrimitive::from_u64(1),
                                  num::FromPrimitive::from_u64(2),
diff --git a/macros/tests/with_custom_values.rs b/macros/tests/with_custom_values.rs
new file mode 100644
index 0000000..7373570
--- /dev/null
+++ b/macros/tests/with_custom_values.rs
@@ -0,0 +1,33 @@
+// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(rustc_macro)]
+
+extern crate num;
+#[macro_use]
+extern crate num_macros;
+
+#[derive(Debug, PartialEq, FromPrimitive)]
+enum Color {
+    Red,
+    Blue = 5,
+    Green,
+}
+
+#[test]
+fn test_from_primitive_for_enum_with_custom_value() {
+    let v: [Option<Color>; 4] = [num::FromPrimitive::from_u64(0),
+                                 num::FromPrimitive::from_u64(5),
+                                 num::FromPrimitive::from_u64(6),
+                                 num::FromPrimitive::from_u64(3)];
+
+    assert_eq!(v,
+               [Some(Color::Red), Some(Color::Blue), Some(Color::Green), None]);
+}