diff --git a/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/DebugDataDumperTest.java b/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/DebugDataDumperTest.java
index 5b8f72e710e..697711d3a73 100644
--- a/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/DebugDataDumperTest.java
+++ b/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/DebugDataDumperTest.java
@@ -51,7 +51,7 @@ void saveGossipMessageDecodingError_shouldSaveToFile(@TempDir Path tempDir) {
     manager.saveGossipMessageDecodingError("test_topic", arrivalTimestamp, messageBytes);
 
     final String fileName =
-        String.format("%s.ssz", manager.formatOptionalTimestamp(arrivalTimestamp));
+        String.format("%s.ssz", manager.formatTimestamp(timeProvider.getTimeInMillis()));
     final Path expectedFile =
         tempDir
             .resolve("gossip_messages")
@@ -70,7 +70,7 @@ void saveGossipMessageDecodingError_shouldNotSaveToFileWhenDisabled(@TempDir Pat
     assertThat(manager.isEnabled()).isFalse();
 
     final String fileName =
-        String.format("%s.ssz", manager.formatOptionalTimestamp(arrivalTimestamp));
+        String.format("%s.ssz", manager.formatTimestamp(timeProvider.getTimeInMillis()));
     final Path expectedFile =
         tempDir.resolve("gossip_messages").resolve("decoding_error").resolve(fileName);
     checkFileNotExist(expectedFile);
@@ -85,7 +85,7 @@ void saveGossipRejectedMessageToFile_shouldSaveToFile(@TempDir Path tempDir) {
     manager.saveGossipRejectedMessageToFile("test_topic", arrivalTimestamp, messageBytes);
 
     final String fileName =
-        String.format("%s.ssz", manager.formatOptionalTimestamp(arrivalTimestamp));
+        String.format("%s.ssz", manager.formatTimestamp(timeProvider.getTimeInMillis()));
     final Path expectedFile =
         tempDir.resolve("gossip_messages").resolve("rejected").resolve(topic).resolve(fileName);
     checkBytesSavedToFile(expectedFile, messageBytes);