diff --git a/ChangeLog b/ChangeLog
index 69119dee59..f5fb2ee583 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-05  Christian Persch  <chpe@gnome.org>
+
+        * tests/defaultvaluetest.c: Fix mem leak, and don't pass
+        GType as integer through gpointer. Bug #507395.
+
 2008-01-04  Mathias Hasselmann  <mathias@openismus.com>
 
 	Avoid some compiler warnings (#507000).
diff --git a/tests/defaultvaluetest.c b/tests/defaultvaluetest.c
index f3c41e192b..b36e7fb9ac 100644
--- a/tests/defaultvaluetest.c
+++ b/tests/defaultvaluetest.c
@@ -63,9 +63,9 @@ test_type (gconstpointer data)
   GParamSpec **pspecs;
   guint n_pspecs, i;
   GType type;
-  
-  type = GPOINTER_TO_INT (data);
-  
+
+  type = * (GType *) data;
+
   if (!G_TYPE_IS_CLASSED (type))
     return;
 
@@ -278,6 +278,7 @@ test_type (gconstpointer data)
       check_property ("Property", pspec, &value);
       g_value_unset (&value);
     }
+  g_free (pspecs);
 
   if (g_type_is_a (type, GTK_TYPE_WIDGET))
     {
@@ -299,6 +300,8 @@ test_type (gconstpointer data)
 	  check_property ("Style property", pspec, &value);
 	  g_value_unset (&value);
 	}
+
+      g_free (pspecs);
     }
   
   if (g_type_is_a (type, GDK_TYPE_WINDOW))
@@ -326,7 +329,7 @@ main (int argc, char **argv)
       testname = g_strdup_printf ("/Default Values/%s",
 				  g_type_name (otypes[i]));
       g_test_add_data_func (testname,
-			    GINT_TO_POINTER (otypes[i]),
+                            &otypes[i],
 			    test_type);
       g_free (testname);
     }