diff --git a/ssl/test/runner/conn.go b/ssl/test/runner/conn.go
index 3a19810..d516651 100644
--- a/ssl/test/runner/conn.go
+++ b/ssl/test/runner/conn.go
@@ -1174,6 +1174,13 @@
 		if pack := c.config.Bugs.ExpectPackedEncryptedHandshake; pack > 0 && len(data) < pack && c.out.epoch.cipher != nil {
 			c.seenHandshakePackEnd = true
 		}
+		if c.isDTLS {
+			record, err := c.makeDTLSRecordNumberInfo(&c.in.epoch, c.hand.Bytes())
+			if err != nil {
+				return err
+			}
+			c.receivedFlightRecords = append(c.receivedFlightRecords, record)
+		}
 
 	case recordTypeACK:
 		if typ != want || !c.isDTLS {
diff --git a/ssl/test/runner/dtls.go b/ssl/test/runner/dtls.go
index 9bc466f..f56c44d 100644
--- a/ssl/test/runner/dtls.go
+++ b/ssl/test/runner/dtls.go
@@ -674,11 +674,6 @@
 			if err := c.readRecord(recordTypeHandshake); err != nil {
 				return nil, err
 			}
-			record, err := c.makeDTLSRecordNumberInfo(&c.in.epoch, c.hand.Bytes())
-			if err != nil {
-				return nil, err
-			}
-			c.receivedFlightRecords = append(c.receivedFlightRecords, record)
 		}
 
 		// Read the next fragment. It must fit entirely within