diff --git a/src/proto/peer/message.rs b/src/proto/peer/message.rs
index 2af7a4c..5452c6f 100644
--- a/src/proto/peer/message.rs
+++ b/src/proto/peer/message.rs
@@ -169,13 +169,15 @@ mod tests {
     }
 
     #[test]
-    #[should_panic]
     fn invalid_code() {
         let mut bytes = BytesMut::new();
         ProtoEncoder::new(&mut bytes).encode_u32(1337).unwrap();
 
         let mut cursor = io::Cursor::new(bytes);
-        Message::decode(&mut ProtoDecoder::new(&mut cursor)).unwrap();
+        match Message::decode(&mut ProtoDecoder::new(&mut cursor)) {
+            Err(DecodeError::UnknownCodeError(1337)) => {},
+            result => panic!(result),
+        }
     }
 
     #[test]
diff --git a/src/proto/server/request.rs b/src/proto/server/request.rs
index 5cc17fb..27e8f75 100644
--- a/src/proto/server/request.rs
+++ b/src/proto/server/request.rs
@@ -603,6 +603,18 @@ mod tests {
         assert_eq!(output, input);
     }
 
+    #[test]
+    fn invalid_code() {
+        let mut bytes = BytesMut::new();
+        ProtoEncoder::new(&mut bytes).encode_u32(1337).unwrap();
+
+        let mut cursor = io::Cursor::new(bytes);
+        match ServerRequest::decode(&mut ProtoDecoder::new(&mut cursor)) {
+            Err(DecodeError::UnknownCodeError(1337)) => {},
+            result => panic!(result),
+        }
+    }
+
     #[test]
     fn roundtrip_cannot_connect_request() {
         roundtrip(ServerRequest::CannotConnectRequest(CannotConnectRequest {