diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index b9abea649..27d9451f1 100644
--- a/cogl/tests/conform/meson.build
+++ b/cogl/tests/conform/meson.build
@@ -1,6 +1,5 @@
 cogl_test_conformance_sources = [
   'test-conform-main.c',
-  'test-alpha-textures.c',
   'test-texture-get-set-data.c',
   'test-framebuffer-get-bits.c',
   'test-primitive-and-journal.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 1ef3bdc96..8cc12b60b 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -66,7 +66,6 @@ main (int argc, char **argv)
   UNPORTED_TEST (test_texture_rectangle);
   UNPORTED_TEST (test_texture_pixmap_x11);
   ADD_TEST (test_texture_get_set_data, 0, 0);
-  ADD_TEST (test_alpha_textures, 0, 0);
 
   UNPORTED_TEST (test_vertex_buffer_contiguous);
   UNPORTED_TEST (test_vertex_buffer_interleved);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index 2396f08c3..cc8ce7876 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/cogl/tests/conform/test-declarations.h
@@ -6,7 +6,6 @@ void test_path_clip (void);
 void test_depth_test (void);
 void test_backface_culling (void);
 void test_texture_get_set_data (void);
-void test_alpha_textures (void);
 void test_framebuffer_get_bits (void);
 void test_primitive_and_journal (void);
 void test_copy_replace_texture (void);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index b9529278e..bae45967a 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -29,6 +29,7 @@ cogl_tests = [
   [ 'test-alpha-test', [] ],
   [ 'test-map-buffer-range', [] ],
   [ 'test-npot-texture', [] ],
+  [ 'test-alpha-textures', [] ],
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-alpha-textures.c b/src/tests/cogl/conform/test-alpha-textures.c
similarity index 97%
rename from cogl/tests/conform/test-alpha-textures.c
rename to src/tests/cogl/conform/test-alpha-textures.c
index 05a2a8a37..ebba4a26e 100644
--- a/cogl/tests/conform/test-alpha-textures.c
+++ b/src/tests/cogl/conform/test-alpha-textures.c
@@ -2,8 +2,7 @@
 
 #include <string.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 static void
 create_pipeline (CoglTexture **tex_out,
@@ -45,7 +44,7 @@ create_pipeline (CoglTexture **tex_out,
   *tex_out = tex;
 }
 
-void
+static void
 test_alpha_textures (void)
 {
   CoglTexture *tex1, *tex2;
@@ -122,3 +121,6 @@ test_alpha_textures (void)
     g_print ("OK\n");
 }
 
+COGL_TEST_SUITE (
+  g_test_add_func ("/alpha-textures", test_alpha_textures);
+)