diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index b3983d3bd..7289b419e 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -48,6 +48,7 @@ test_programs = \
 	bookmarkfile			\
 	bytes				\
 	cache				\
+	charset				\
 	checksum			\
 	collate				\
 	cond				\
diff --git a/glib/tests/charset.c b/glib/tests/charset.c
index ef4370a42..0a1c8ce3f 100644
--- a/glib/tests/charset.c
+++ b/glib/tests/charset.c
@@ -9,9 +9,6 @@
  * See the included COPYING file for more information.
  */
 
-#undef G_DISABLE_ASSERT
-#undef G_LOG_DOMAIN
-
 #include "glib.h"
 
 #define TEST_LOCALE "fr_FR.UTF-8@latin:en_US.UTF-8"