diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index 22af47eea..78d543bb0 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-texture-no-allocate.c',
   'test-pipeline-shader-state.c',
   'test-texture-rg.c',
   'test-fence.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index f0ea1d838..12868b43b 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -76,8 +76,6 @@ main (int argc, char **argv)
 
   ADD_TEST (test_fence, TEST_REQUIREMENT_FENCE, 0);
 
-  ADD_TEST (test_texture_no_allocate, 0, 0);
-
   ADD_TEST (test_texture_rg, TEST_REQUIREMENT_TEXTURE_RG, 0);
 
   g_printerr ("Unknown test name \"%s\"\n", argv[1]);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index 64417a94a..46ca6c037 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/cogl/tests/conform/test-declarations.h
@@ -10,7 +10,6 @@ void test_gles2_context (void);
 void test_gles2_context_fbo (void);
 void test_gles2_context_copy_tex_image (void);
 void test_fence (void);
-void test_texture_no_allocate (void);
 void test_texture_rg (void);
 
 #endif /* COGL_TEST_DECLARATIONS_H */
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index 22cc7d7da..8f9b9c881 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -35,6 +35,7 @@ cogl_tests = [
   [ 'test-primitive-and-journal', [] ],
   [ 'test-copy-replace-texture', [] ],
   [ 'test-pipeline-cache-unrefs-texture', [] ],
+  [ 'test-texture-no-allocate', [] ],
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-texture-no-allocate.c b/src/tests/cogl/conform/test-texture-no-allocate.c
similarity index 93%
rename from cogl/tests/conform/test-texture-no-allocate.c
rename to src/tests/cogl/conform/test-texture-no-allocate.c
index de2f6e0e3..c77495839 100644
--- a/cogl/tests/conform/test-texture-no-allocate.c
+++ b/src/tests/cogl/conform/test-texture-no-allocate.c
@@ -1,7 +1,6 @@
 #include <cogl/cogl.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 /* Tests that the various texture types can be freed without being
  * allocated */
@@ -11,7 +10,7 @@
 #define BIG_TEX_WIDTH 16384
 #define BIG_TEX_HEIGHT 128
 
-void
+static void
 test_texture_no_allocate (void)
 {
   uint8_t *tex_data;
@@ -61,3 +60,7 @@ test_texture_no_allocate (void)
                                               64, 64);
   cogl_object_unref (texture_2d);
 }
+
+COGL_TEST_SUITE (
+  g_test_add_func ("/texture/no-allocate", test_texture_no_allocate);
+)