diff --git a/po/fr.po b/po/fr.po
index ffbd217..f9627f7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: criterion 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-10 23:08+0200\n"
+"POT-Creation-Date: 2015-06-30 12:07+0200\n"
 "PO-Revision-Date: 2015-04-03 17:58+0200\n"
 "Last-Translator:  <franklinmathieu@gmail.com>\n"
 "Language-Team: French\n"
@@ -70,8 +70,10 @@ msgid "%1$s::%2$s: CRASH!\n"
 msgstr "%1$s::%2$s: PLANTAGE!\n"
 
 #: src/log/normal.c:139
-#, c-format
-msgid "%1$sWarning! This test crashed during its setup or teardown.%2$s\n"
+#, fuzzy, c-format
+msgid ""
+"%1$sWarning! The test `%2$s::%3$s` crashed during its setup or teardown."
+"%4$s\n"
 msgstr ""
-"%1$sAttention! Ce test a planté pendant son initialisation ou sa "
-"finalisation.%2$s\n"
+"%1$sAttention! Le test `%2$s::%3$s` a planté pendant son initialisation ou "
+"sa finalisation.%4$s\n"
diff --git a/src/log/normal.c b/src/log/normal.c
index 42645be..8b0f2cc 100644
--- a/src/log/normal.c
+++ b/src/log/normal.c
@@ -136,8 +136,9 @@ void normal_log_test_crash(struct criterion_test_stats *stats) {
 
 void normal_log_other_crash(UNUSED struct criterion_test_stats *stats) {
     criterion_pimportant(CRITERION_PREFIX_DASHES,
-            _("%1$sWarning! This test crashed during its setup or teardown.%2$s\n"),
-            FG_BOLD, RESET);
+            _("%1$sWarning! The test `%2$s::%3$s` crashed during its "
+              "setup or teardown.%4$s\n"),
+            FG_BOLD, stats->test->category, stats->test->name, RESET);
 }
 
 void normal_log_pre_suite(struct criterion_suite_set *set) {