788f64d847d9b8a5619fec84bf257f8105e1e9f9
diff --git a/tests/gobject/gvalue-test.c b/tests/gobject/gvalue-test.c
index f8d4986..2025d91 100644
--- a/tests/gobject/gvalue-test.c
+++ b/tests/gobject/gvalue-test.c
@@ -40,52 +40,68 @@ test_enum_transformation (void         *unused,
   GType type;
   GValue orig = { 0, };
   GValue xform = { 0, };
-  GEnumValue values[] = { {0,"0","0"}, {1,"1","1"}};
+  GEnumValue values[] = { {0,"0_NAME","0_NICK"}, {1,"1_NAME","1_NICK"}};
 
   type = g_enum_register_static ("TestEnum", values);
 
   g_value_init (&orig, type);
   g_value_set_enum (&orig, 1);
 
-  memset (&xform, 0, sizeof (GValue));
   g_value_init (&xform, G_TYPE_CHAR);
   g_value_transform (&orig, &xform);
   g_assert_cmpint (g_value_get_char (&xform), ==, 1);
+  g_value_unset (&xform);
 
-  memset (&xform, 0, sizeof (GValue));
   g_value_init (&xform, G_TYPE_UCHAR);
   g_value_transform (&orig, &xform);
   g_assert_cmpint (g_value_get_uchar (&xform), ==, 1);
+  g_value_unset (&xform);
 
-  memset (&xform, 0, sizeof (GValue));
   g_value_init (&xform, G_TYPE_INT);
   g_value_transform (&orig, &xform);
   g_assert_cmpint (g_value_get_int (&xform), ==, 1);
+  g_value_unset (&xform);
 
-  memset (&xform, 0, sizeof (GValue));
   g_value_init (&xform, G_TYPE_UINT);
   g_value_transform (&orig, &xform);
   g_assert_cmpint (g_value_get_uint (&xform), ==, 1);
+  g_value_unset (&xform);
 
-  memset (&xform, 0, sizeof (GValue));
   g_value_init (&xform, G_TYPE_LONG);
   g_value_transform (&orig, &xform);
   g_assert_cmpint (g_value_get_long (&xform), ==, 1);
+  g_value_unset (&xform);
 
-  memset (&xform, 0, sizeof (GValue));
   g_value_init (&xform, G_TYPE_ULONG);
   g_value_transform (&orig, &xform);
   g_assert_cmpint (g_value_get_ulong (&xform), ==, 1);
+  g_value_unset (&xform);
 
-  memset (&xform, 0, sizeof (GValue));
   g_value_init (&xform, G_TYPE_INT64);
   g_value_transform (&orig, &xform);
   g_assert_cmpint (g_value_get_int64 (&xform), ==, 1);
+  g_value_unset (&xform);
 
-  memset (&xform, 0, sizeof (GValue));
   g_value_init (&xform, G_TYPE_UINT64);
   g_value_transform (&orig, &xform);
   g_assert_cmpint (g_value_get_uint64 (&xform), ==, 1);
+  g_value_unset (&xform);
+
+  g_value_init (&xform, G_TYPE_STRING);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpstr (g_value_get_string (&xform), ==, "1_NAME");
+  g_value_unset (&xform);
+
+  g_value_unset (&orig);
+  g_value_init (&orig, G_TYPE_STRING);
+  g_value_set_string (&orig, "1_NAME");
+
+  g_value_init (&xform, type);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpint (g_value_get_enum (&xform), ==, 1);
+  g_value_unset (&xform);
+
+  g_value_unset (&orig);
 }
 
 
