diff --git a/ChangeLog b/ChangeLog
index f40e09fcb1..c7b055d217 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-14  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
+
+	* stdlib/tst-strfrom.h (ENTRY): Replace use of CSUF with LSUF.
+
 2016-12-14  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/unix/sysv/linux/renameat.c: New file.
diff --git a/stdlib/tst-strfrom.h b/stdlib/tst-strfrom.h
index 31a6492936..75be55fa03 100644
--- a/stdlib/tst-strfrom.h
+++ b/stdlib/tst-strfrom.h
@@ -36,7 +36,7 @@
 #define STRUCT_FOREACH_FLOAT_FTYPE GEN_TEST_STRTOD_FOREACH (FTYPE_MEMBER)
 
 #define ENTRY(FSUF, FTYPE, FTOSTR, LSUF, CSUF, ...)  \
-   CONCAT (__VA_ARGS__, CSUF),
+   CONCAT (__VA_ARGS__, LSUF),
 /* This is hacky way around the seemingly unavoidable macro
  * expansion of the INFINITY or HUGE_VAL like macros in the
  * above.  It is assumed the compiler will implicitly convert