diff --git a/android-snaptesting/src/main/java/com/telefonica/androidsnaptesting/logs/LogsRule.kt b/android-snaptesting/src/main/java/com/telefonica/androidsnaptesting/logs/LogsRule.kt
index b3484f1..62ed083 100644
--- a/android-snaptesting/src/main/java/com/telefonica/androidsnaptesting/logs/LogsRule.kt
+++ b/android-snaptesting/src/main/java/com/telefonica/androidsnaptesting/logs/LogsRule.kt
@@ -47,23 +47,23 @@ public open class GenericLogsRule<LogType>(
         val testName = "${description?.className}_${description?.methodName}"
         val fileName = "${testName}.txt.${System.nanoTime()}"
 
-        val recordedLogs: List<LogType>
-
         if (InstrumentationRegistry.getArguments().getString("record") != "true" && !isTestIgnored) {
             val goldenFile = directories.context.assets.open("${directories.goldenFilesDir}/${testName}.txt")
             val goldenStringLogs = String(goldenFile.readBytes()).takeIf { it.isNotEmpty() }?.split("\n") ?: emptyList()
             val comparison = compare(goldenStringLogs)
+            writeRecordedLogsToFile(fileName, comparison.recordedLogs)
             if (!comparison.success) {
                 val compareFile = File(directories.failuresDir, fileName)
                 compareFile.createNewFile()
                 compareFile.writeText(comparison.failure!!)
                 throw AssertionError("Logs do not match:\n${comparison.failure}")
             }
-            recordedLogs = comparison.recordedLogs
         } else {
-            recordedLogs = recorder.getRecordedLogs()
+            writeRecordedLogsToFile(fileName, recorder.getRecordedLogs())
         }
+    }
 
+    private fun writeRecordedLogsToFile(fileName: String, recordedLogs: List<LogType>) {
         val log = recordedLogs.joinToString("\n") { stringMapper.fromLog(it) }
         val testFile = File(directories.recordedDir, fileName)
         testFile.createNewFile()
diff --git a/include-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/AndroidSnaptestingPlugin.kt b/include-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/AndroidSnaptestingPlugin.kt
index 3daf1da..59a8dd9 100644
--- a/include-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/AndroidSnaptestingPlugin.kt
+++ b/include-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/AndroidSnaptestingPlugin.kt
@@ -149,10 +149,10 @@ class AndroidSnaptestingPlugin @Inject constructor(
                 }
                 if (lastRecordedFile != null) {
                     lastRecordedFile
-                        .renameTo(File(recordedDir, "$key.txt"))
+                        .renameTo(File(recordedDir, key))
                     File(failuresDir, lastRecordedFile.name)
                         .takeIf { it.exists() }
-                        ?.renameTo(File(failuresDir, "$key.txt"))
+                        ?.renameTo(File(failuresDir, key))
                 }
             }
     }