diff --git a/ChangeLog b/ChangeLog
index fd0ec11400..0f9a31606f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-10  Mike FABIAN  <mfabian@redhat.com>
+
+	* stdlib/tst-strfmon_l.c: Fix test cases to agree with the changes in
+	Indian monetary formatting
+	* stdlib/Makefile: Adapt list of locales needed for the tst-strfmon_l.c
+	test cases.
+
 2017-08-09  Dmitry V. Levin  <ldv@altlinux.org>
 
 	* sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h (enum __ptrace_request):
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 4d90e14fd8..e4b36ca118 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -153,7 +153,7 @@ include ../Rules
 
 ifeq ($(run-built-tests),yes)
 LOCALES := cs_CZ.UTF-8 de_DE.UTF-8 en_US.ISO-8859-1 tr_TR.UTF-8 \
-	   tr_TR.ISO-8859-9 tg_TJ.UTF-8 te_IN.UTF-8 bn_IN.UTF-8 \
+	   tr_TR.ISO-8859-9 tg_TJ.UTF-8 hr_HR.UTF-8 hi_IN.UTF-8 \
 	   el_GR.UTF-8
 include ../gen-locales.mk
 
diff --git a/stdlib/tst-strfmon_l.c b/stdlib/tst-strfmon_l.c
index 49fa31907e..ed7d486960 100644
--- a/stdlib/tst-strfmon_l.c
+++ b/stdlib/tst-strfmon_l.c
@@ -160,7 +160,20 @@ static const struct locale_pair tests[] =
       }
     },
     {
-      "te_IN.UTF-8",
+      "hr_HR.UTF-8",
+      {
+        {
+          "HRK 1 234 567,89", "Kn 1 234 567,89",
+          "HRK 1234567,89", "Kn 1234567,89"
+        },
+        {
+          "-HRK 1 234 567,89", "-Kn 1 234 567,89",
+          "-HRK 1234567,89", "-Kn 1234567,89"
+        }
+      }
+    },
+    {
+      "hi_IN.UTF-8",
       {
         {
           "INR12,34,567.89", "\u20b912,34,567.89",
@@ -172,19 +185,6 @@ static const struct locale_pair tests[] =
         }
       }
     },
-    {
-      "bn_IN.UTF-8",
-      {
-        {
-          "INR 12,345,67.89", "\u20b9 12,345,67.89",
-          "INR 1234567.89", "\u20b9 1234567.89"
-        },
-        {
-          "-INR 12,345,67.89", "-\u20b9 12,345,67.89",
-          "-INR 1234567.89", "-\u20b9 1234567.89"
-        }
-      }
-    },
     {
       "el_GR.UTF-8",
       {