diff --git a/src/common/packet-metadata-test.cc b/src/common/packet-metadata-test.cc
index e274bbc4d..a44046a4e 100644
--- a/src/common/packet-metadata-test.cc
+++ b/src/common/packet-metadata-test.cc
@@ -547,6 +547,63 @@ PacketMetadataTest::RunTests (void)
   p->RemoveAtStart (8+10+8);
   CHECK_HISTORY (p, 1, 8);
 
+  p = Create<Packet> (0);
+  ADD_HEADER (p, 8);
+  REM_HEADER (p, 8);
+  CHECK_HISTORY (p, 0);
+
+  p = Create<Packet> (0);
+  ADD_TRAILER (p, 8);
+  REM_TRAILER (p, 8);
+  CHECK_HISTORY (p, 0);
+
+  p = Create<Packet> (0);
+  ADD_HEADER (p, 8);
+  p->RemoveAtStart (8);
+  CHECK_HISTORY (p, 0);
+
+  p = Create<Packet> (0);
+  ADD_HEADER (p, 8);
+  ADD_TRAILER (p, 8);
+  REM_TRAILER (p, 8);
+  REM_HEADER (p, 8);
+  CHECK_HISTORY (p, 0);
+
+  p = Create<Packet> (0);
+  ADD_HEADER (p, 8);
+  ADD_TRAILER (p, 8);
+  REM_HEADER (p, 8);
+  REM_TRAILER (p, 8);
+  CHECK_HISTORY (p, 0);
+
+  p = Create<Packet> (0);
+  ADD_HEADER (p, 8);
+  ADD_TRAILER (p, 8);
+  REM_TRAILER (p, 8);
+  p->RemoveAtStart (8);
+  CHECK_HISTORY (p, 0);
+
+  p = Create<Packet> (0);
+  ADD_HEADER (p, 8);
+  ADD_TRAILER (p, 8);
+  REM_HEADER (p, 8);
+  p->RemoveAtEnd (8);
+  CHECK_HISTORY (p, 0);
+
+  p = Create<Packet> (0);
+  ADD_HEADER (p, 8);
+  ADD_TRAILER (p, 8);
+  REM_TRAILER (p, 8);
+  p->RemoveAtEnd (8);
+  CHECK_HISTORY (p, 0);
+
+  p = Create<Packet> (0);
+  ADD_HEADER (p, 8);
+  ADD_TRAILER (p, 8);
+  REM_HEADER (p, 8);
+  p->RemoveAtStart (8);
+  CHECK_HISTORY (p, 0);
+
   return ok;
 }