diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl-atlas-texture.c
index 7f62efceb..30dd319e5 100644
--- a/cogl/cogl-atlas-texture.c
+++ b/cogl/cogl-atlas-texture.c
@@ -276,7 +276,8 @@ _cogl_atlas_texture_free (CoglAtlasTexture *atlas_tex)
 {
   _cogl_atlas_texture_remove_from_atlas (atlas_tex);
 
-  cogl_object_unref (atlas_tex->sub_texture);
+  if (atlas_tex->sub_texture)
+    cogl_object_unref (atlas_tex->sub_texture);
 
   /* Chain up */
   _cogl_texture_free (COGL_TEXTURE (atlas_tex));
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index 174410eca..5e3f09190 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -138,7 +138,7 @@ main (int argc, char **argv)
 
   ADD_TEST (test_fence, TEST_REQUIREMENT_FENCE, 0);
 
-  ADD_TEST (test_texture_no_allocate, 0, TEST_KNOWN_FAILURE);
+  ADD_TEST (test_texture_no_allocate, 0, 0);
 
   g_printerr ("Unknown test name \"%s\"\n", argv[1]);