diff --git a/src/frame.rs b/src/frame.rs
index e9ed3cc2..7f9eb9cb 100644
--- a/src/frame.rs
+++ b/src/frame.rs
@@ -979,7 +979,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = " out of bounds atomic index in `chfl_atom_from_frame`")]
     fn out_of_bounds_atom() {
         let mut frame = Frame::new();
         frame.resize(22);
@@ -1001,7 +1001,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "out of bounds atomic index in `Frame::remove`")]
     fn remove_out_of_bounds() {
         let mut frame = Frame::new();
         frame.resize(32);
@@ -1089,7 +1089,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "out of bounds atomic index in `Topology::add_bond`")]
     fn out_of_bounds_bonds() {
         let mut frame = Frame::new();
         frame.resize(12);
@@ -1097,7 +1097,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "out of bounds atomic index in `Topology::remove_bond`")]
     fn out_of_bounds_remove_bond() {
         let mut frame = Frame::new();
         frame.resize(12);
@@ -1105,7 +1105,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "out of bounds atomic index in `Topology::add_bond`")]
     fn out_of_bounds_bonds_with_order() {
         let mut frame = Frame::new();
         frame.resize(12);
diff --git a/src/selection.rs b/src/selection.rs
index 0b234628..54d6eaf4 100644
--- a/src/selection.rs
+++ b/src/selection.rs
@@ -355,14 +355,14 @@ mod tests {
         }
 
         #[test]
-        #[should_panic]
+        #[should_panic(expected = "assertion failed: i < self.len()")]
         fn out_of_bound() {
             let m = Match::new(&[1, 2]);
             let _ = m[2];
         }
 
         #[test]
-        #[should_panic]
+        #[should_panic(expected = "assertion failed: atoms.len() <= 4")]
         fn too_big() {
             let _ = Match::new(&[1, 2, 3, 5, 4]);
         }
diff --git a/src/topology.rs b/src/topology.rs
index 43c42b8c..184270dd 100644
--- a/src/topology.rs
+++ b/src/topology.rs
@@ -851,7 +851,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "out of bounds atomic index in `Topology::remove`")]
     fn out_of_bounds_remove() {
         let mut topology = Topology::new();
         topology.resize(18);
@@ -886,7 +886,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "out of bounds atomic index in `Topology::add_bond`")]
     fn out_of_bounds_bonds() {
         let mut topology = Topology::new();
         topology.resize(12);
@@ -894,7 +894,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "out of bounds atomic index in `Topology::remove_bond`")]
     fn out_of_bounds_remove_bond() {
         let mut topology = Topology::new();
         topology.resize(12);
@@ -902,7 +902,7 @@ mod test {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "out of bounds atomic index in `Topology::add_bond`")]
     fn out_of_bounds_bonds_with_order() {
         let mut topology = Topology::new();
         topology.resize(12);