diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index c9e81d52e..f017f2c7c 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -159,8 +159,8 @@ INCLUDES = \
 test_conformance_CPPFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DCOGL_ENABLE_EXPERIMENTAL_API \
-	-DCOGL_DISABLE_DEPRECATED \
-	-DCLUTTER_DISABLE_DEPRECATED \
+	-DG_DISABLE_DEPRECATION_WARNINGS \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
 	-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\"
 
 test_conformance_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
diff --git a/tests/conform/test-clutter-cairo-texture.c b/tests/conform/test-clutter-cairo-texture.c
index 5708f5a31..a6b73c83b 100644
--- a/tests/conform/test-clutter-cairo-texture.c
+++ b/tests/conform/test-clutter-cairo-texture.c
@@ -1,5 +1,3 @@
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
 
diff --git a/tests/conform/test-texture-fbo.c b/tests/conform/test-texture-fbo.c
index 6bbfaf379..9aa696db5 100644
--- a/tests/conform/test-texture-fbo.c
+++ b/tests/conform/test-texture-fbo.c
@@ -1,5 +1,3 @@
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
 
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index eb4bde652..cf324ec0e 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -137,8 +137,8 @@ test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 test_interactive_CPPFLAGS = \
 	-DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
 	-DG_DISABLE_SINGLE_INCLUDES \
-	-DCOGL_DISABLE_DEPRECATED \
-	-DCLUTTER_DISABLE_DEPRECATED
+	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS
 test_interactive_LDFLAGS = -export-dynamic
 test_interactive_LDADD = $(CLUTTER_LIBS) $(common_ldadd) -lm
 
diff --git a/tests/interactive/test-cairo-flowers.c b/tests/interactive/test-cairo-flowers.c
index 17ff4a0ad..5dca4577b 100644
--- a/tests/interactive/test-cairo-flowers.c
+++ b/tests/interactive/test-cairo-flowers.c
@@ -1,9 +1,6 @@
 /*
  * Pretty cairo flower hack.
  */
-
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 
 #ifndef _MSC_VER
diff --git a/tests/interactive/test-fbo.c b/tests/interactive/test-fbo.c
index b50d974d6..5854ad181 100644
--- a/tests/interactive/test-fbo.c
+++ b/tests/interactive/test-fbo.c
@@ -1,5 +1,3 @@
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 
 #include <errno.h>
diff --git a/tests/interactive/test-shader.c b/tests/interactive/test-shader.c
index f9f6f5663..44ab581ff 100644
--- a/tests/interactive/test-shader.c
+++ b/tests/interactive/test-shader.c
@@ -1,7 +1,3 @@
-/*#define TEST_GROUP */
-
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 
 #include <errno.h>