diff --git a/ChangeLog b/ChangeLog
index 31b30f66..378eaf25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 2005-09-20 Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
 
     * configure.ac src/sfconfig.h
-	Check for <locale.h> and the function setlocale().
-	Set config variables to zero if not found.
+    Check for <locale.h> and the function setlocale().
+    Set config variables to zero if not found.
+
+    * tests/locale_test.c tests/Makefile.am
+    Add new test program and hook into build/test system.
 
 2005-09-18 Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a2813ca9..8db2561b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,8 @@ noinst_PROGRAMS = sfversion floating_point_test write_read_test \
 	peak_chunk_test command_test stdin_test stdout_test stdio_test \
 	pcm_test headerless_test pipe_test benchmark header_test misc_test \
 	raw_test string_test open_fail_test multi_file_test dither_test \
-	scale_clip_test win32_test fix_this aiff_rw_test virtual_io_test
+	scale_clip_test win32_test fix_this aiff_rw_test virtual_io_test \
+	locale_test
 
 SNDFILEDIR = ../src
 INCLUDES = -I$(srcdir)/$(SNDFILEDIR)
@@ -52,6 +53,9 @@ aiff_rw_test_LDADD = $(SNDFILEDIR)/libsndfile.la
 command_test_SOURCES = command_test.c utils.c
 command_test_LDADD = $(SNDFILEDIR)/libsndfile.la
 
+locale_test_SOURCES = locale_test.c utils.c
+locale_test_LDADD = $(SNDFILEDIR)/libsndfile.la
+
 pcm_test_SOURCES = pcm_test.c utils.c
 pcm_test_LDADD = $(SNDFILEDIR)/libsndfile.la
 
@@ -168,6 +172,7 @@ generic-tests : error_test ulaw_test alaw_test command_test floating_point_test
 	./floating_point_test
 	./scale_clip_test
 	./headerless_test
+	./locale_test
 	@echo "----------------------------------------------------------------------"
 	@echo "  `./sfversion` passed common tests."
 	@echo "----------------------------------------------------------------------"
diff --git a/tests/locale_test.c b/tests/locale_test.c
index 4c76f568..fe3d34c6 100644
--- a/tests/locale_test.c
+++ b/tests/locale_test.c
@@ -36,37 +36,30 @@
 typedef struct
 {	const char *locale ;
 	const char *filename ;
-	int	width ;
 } LOCALE_DATA ;
 
-static void locale_test (const char * locname, const char * filename, int width) ;
+static void locale_test (const char * locname, const char * filename) ;
 
 int
 main (void)
 {	LOCALE_DATA ldata [] =
-	{	{	"de_DE", "F\303\274\303\237e.au", 7 },
-		{	"en_AU", "kangaroo.au", 11 },
-		{	"POSIX", "posix.au", 8 },
-		{	"pt_PT", "concei\303\247\303\243o.au", 12 },
-		{	"ja_JP", "\343\201\212\343\201\257\343\202\210\343\201\206\343\201\224\343\201\226\343\201\204\343\201\276\343\201\231.au", 21 },
-		{	"vi_VN", "qu\341\273\221c ng\341\273\257.au", 11 },
-
-		{	NULL, NULL, 0 }
+	{	{	"POSIX",				"posix.au" },
+		{	"en_AU.UTF-8",			"english_AU.au" },
+		{	NULL, NULL }
 		} ;
 	int k ;
 
 	for (k = 0 ; ldata [k].locale != NULL ; k++)
-		locale_test (ldata [k].locale, ldata [k].filename, ldata [k].width) ;
+		locale_test (ldata [k].locale, ldata [k].filename) ;
 
 	return 0 ;
 } /* main */
 
 static void
-locale_test (const char * locname, const char * filename, int width)
+locale_test (const char * locname, const char * filename)
 {
 #if (HAVE_LOCALE_H == 0 || HAVE_SETLOCALE == 0)
 	locname = filename = NULL ;
-	width = 0 ;
 	return ;
 #else
 	const short wdata [] = { 1, 2, 3, 4, 5, 6, 7, 8 } ;
@@ -81,8 +74,7 @@ locale_test (const char * locname, const char * filename, int width)
 	if (setlocale (LC_ALL, locname) == NULL)
 		return ;
 
-	printf ("    locale_test : %-6s   %s%*c : ", locname, filename, 28 - width, ' ') ;
-	fflush (stdout) ;
+	print_test_name ("locale_test", filename) ;
 
 	sfinfo.format = SF_FORMAT_AU | SF_FORMAT_PCM_16 ;
 	sfinfo.channels = 1 ;
@@ -107,7 +99,7 @@ locale_test (const char * locname, const char * filename, int width)
 
 /*
 ** Do not edit or modify anything in this comment block.
-** The arch-tag line is a file identity tag for the GNU Arch
+** The arch-tag line is a file identity tag for the GNU Arch 
 ** revision control system.
 **
 ** arch-tag: 087b25a3-03a2-4195-acd2-23fbbc489021