diff --git a/tests/conform/test-animator.c b/tests/conform/test-animator.c
index 30585d2aa..fc7fc9abd 100644
--- a/tests/conform/test-animator.c
+++ b/tests/conform/test-animator.c
@@ -18,7 +18,12 @@ test_animator_multi_properties (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif
 
   foo = clutter_script_get_object (script, "foo");
   g_assert (G_IS_OBJECT (foo));
@@ -116,7 +121,12 @@ test_animator_properties (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif
 
   animator = clutter_script_get_object (script, "animator");
   g_assert (CLUTTER_IS_ANIMATOR (animator));
@@ -172,7 +182,12 @@ test_animator_base (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif
 
   animator = clutter_script_get_object (script, "animator");
   g_assert (CLUTTER_IS_ANIMATOR (animator));
diff --git a/tests/conform/test-model.c b/tests/conform/test-model.c
index 78c503496..c37f6b1a4 100644
--- a/tests/conform/test-model.c
+++ b/tests/conform/test-model.c
@@ -351,7 +351,12 @@ test_list_model_from_script (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif /* GLIB_CHECK_VERSION (2, 20, 0) */
 
   model = clutter_script_get_object (script, "test-model");
 
diff --git a/tests/conform/test-script-parser.c b/tests/conform/test-script-parser.c
index 4b3e40182..18a49c0f1 100644
--- a/tests/conform/test-script-parser.c
+++ b/tests/conform/test-script-parser.c
@@ -129,7 +129,12 @@ test_script_child (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif
 
   container = actor = NULL;
   clutter_script_get_objects (script,
@@ -176,7 +181,12 @@ test_script_single (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif
 
   actor = clutter_script_get_object (script, "test");
   g_assert (CLUTTER_IS_RECTANGLE (actor));
@@ -211,7 +221,12 @@ test_script_implicit_alpha (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif
 
   behaviour = clutter_script_get_object (script, "test");
   g_assert (CLUTTER_IS_BEHAVIOUR (behaviour));
@@ -244,7 +259,12 @@ test_script_object_property (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif
 
   actor = clutter_script_get_object (script, "test");
   g_assert (CLUTTER_IS_BOX (actor));
@@ -271,7 +291,12 @@ test_script_named_object (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif
 
   actor = clutter_script_get_object (script, "test");
   g_assert (CLUTTER_IS_BOX (actor));
@@ -298,7 +323,12 @@ test_script_animation (TestConformSimpleFixture *fixture,
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
+
+#if GLIB_CHECK_VERSION (2, 20, 0)
+  g_assert_no_error (error);
+#else
   g_assert (error == NULL);
+#endif
 
   animation = clutter_script_get_object (script, "test");
   g_assert (CLUTTER_IS_ANIMATION (animation));