diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index 08f685d66..40d122fcc 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-pipeline-uniforms.c',
   'test-pixel-buffer.c',
   'test-premult.c',
   'test-snippets.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 6a7ec44f4..a19b9d873 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -86,7 +86,6 @@ main (int argc, char **argv)
 
   ADD_TEST (test_primitive, 0, 0);
 
-  ADD_TEST (test_pipeline_uniforms, 0, 0);
   ADD_TEST (test_snippets, 0, 0);
   ADD_TEST (test_custom_attributes, 0, 0);
 
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index 54006afa1..fefc553c4 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/cogl/tests/conform/test-declarations.h
@@ -19,7 +19,6 @@ void test_read_texture_formats (void);
 void test_write_texture_formats (void);
 void test_alpha_textures (void);
 void test_primitive (void);
-void test_pipeline_uniforms (void);
 void test_snippets (void);
 void test_custom_attributes (void);
 void test_offscreen (void);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index a6d365d90..be9c94e7e 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -7,6 +7,7 @@ cogl_tests = [
   'test-backface-culling',
   'test-just-vertex-shader',
   'test-pipeline-user-matrix',
+  'test-pipeline-uniforms',
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-pipeline-uniforms.c b/src/tests/cogl/conform/test-pipeline-uniforms.c
similarity index 98%
rename from cogl/tests/conform/test-pipeline-uniforms.c
rename to src/tests/cogl/conform/test-pipeline-uniforms.c
index 299985fec..ea2950e48 100644
--- a/cogl/tests/conform/test-pipeline-uniforms.c
+++ b/src/tests/cogl/conform/test-pipeline-uniforms.c
@@ -2,8 +2,7 @@
 
 #include <string.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 #define LONG_ARRAY_SIZE 128
 
@@ -381,7 +380,7 @@ validate_long_pipeline_result (void)
   check_pos (15, 0xff0000ff);
 }
 
-void
+static void
 test_pipeline_uniforms (void)
 {
   TestState state;
@@ -414,3 +413,7 @@ test_pipeline_uniforms (void)
   if (cogl_test_verbose ())
     g_print ("OK\n");
 }
+
+COGL_TEST_SUITE (
+  g_test_add_func ("/pipeline/uniforms", test_pipeline_uniforms);
+)