diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index 2951aa191..f4e0c1aa8 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-sub-texture.c',
   'test-custom-attributes.c',
   'test-offscreen.c',
   'test-journal.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 56dbb1aee..997335826 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -67,7 +67,6 @@ main (int argc, char **argv)
   ADD_TEST (test_npot_texture, 0, 0);
   UNPORTED_TEST (test_multitexture);
   UNPORTED_TEST (test_texture_mipmaps);
-  ADD_TEST (test_sub_texture, 0, 0);
   UNPORTED_TEST (test_texture_rectangle);
   UNPORTED_TEST (test_texture_pixmap_x11);
   ADD_TEST (test_texture_get_set_data, 0, 0);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index 506a31b1a..e03b427df 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/cogl/tests/conform/test-declarations.h
@@ -8,7 +8,6 @@ void test_backface_culling (void);
 void test_layer_remove (void);
 void test_sparse_pipeline (void);
 void test_npot_texture (void);
-void test_sub_texture (void);
 void test_texture_get_set_data (void);
 void test_read_texture_formats (void);
 void test_write_texture_formats (void);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index 4625ef5d5..08ec15761 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -12,6 +12,7 @@ cogl_tests = [
   'test-premult',
   'test-snippets',
   'test-wrap-modes',
+  'test-sub-texture',
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-sub-texture.c b/src/tests/cogl/conform/test-sub-texture.c
similarity index 98%
rename from cogl/tests/conform/test-sub-texture.c
rename to src/tests/cogl/conform/test-sub-texture.c
index 9e8d1164c..808791d31 100644
--- a/cogl/tests/conform/test-sub-texture.c
+++ b/src/tests/cogl/conform/test-sub-texture.c
@@ -1,8 +1,7 @@
 #include <cogl/cogl.h>
 #include <string.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 #define SOURCE_SIZE        32
 #define SOURCE_DIVISIONS_X 2
@@ -301,7 +300,7 @@ validate_result (TestState *state)
   cogl_object_unref (test_tex);
 }
 
-void
+static void
 test_sub_texture (void)
 {
   TestState state;
@@ -324,3 +323,6 @@ test_sub_texture (void)
     g_print ("OK\n");
 }
 
+COGL_TEST_SUITE (
+  g_test_add_func ("/sub-texture", test_sub_texture);
+)