diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 0e72e70aa..8c5097ee1 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -74,6 +74,9 @@ collate_LDADD       = $(progs_ldadd)
 TEST_PROGS         += utf8-pointer
 utf8_pointer_LDADD       = $(progs_ldadd)
 
+TEST_PROGS         += utf8-validate
+utf8_validate_LDADD       = $(progs_ldadd)
+
 if OS_UNIX
 
 # some testing of gtester funcitonality
diff --git a/tests/utf8-validate.c b/glib/tests/utf8-validate.c
similarity index 100%
rename from tests/utf8-validate.c
rename to glib/tests/utf8-validate.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 44afe9541..967a88c02 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -125,7 +125,6 @@ test_programs =					\
 	type-test				\
 	unicode-caseconv			\
 	unicode-encoding			\
-	utf8-validate				\
 	uri-test
 
 test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh run-assert-msg-test.sh
@@ -189,8 +188,6 @@ type_test_LDADD = $(progs_ldadd)
 unicode_encoding_LDADD = $(progs_ldadd)
 unicode_caseconv_LDADD = $(progs_ldadd)
 unicode_collate_LDADD = $(progs_ldadd)
-utf8_validate_LDADD = $(progs_ldadd)
-utf8_pointer_LDADD = $(progs_ldadd)
 uri_test_LDADD = $(progs_ldadd)
 markup_collect_LDADD = $(progs_ldadd)