diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index e4558be50..29ecdbd70 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-primitive-and-journal.c',
   'test-copy-replace-texture.c',
   'test-pipeline-cache-unrefs-texture.c',
   'test-texture-no-allocate.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index a048dbb09..cfed8f7f2 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -70,8 +70,6 @@ main (int argc, char **argv)
   UNPORTED_TEST (test_vertex_buffer_interleved);
   UNPORTED_TEST (test_vertex_buffer_mutability);
 
-  ADD_TEST (test_primitive_and_journal, 0, 0);
-
   ADD_TEST (test_copy_replace_texture, 0, 0);
 
   ADD_TEST (test_pipeline_cache_unrefs_texture, 0, 0);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index c4018ce52..8c815b71a 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/cogl/tests/conform/test-declarations.h
@@ -5,7 +5,6 @@ void test_path (void);
 void test_path_clip (void);
 void test_depth_test (void);
 void test_backface_culling (void);
-void test_primitive_and_journal (void);
 void test_copy_replace_texture (void);
 void test_pipeline_cache_unrefs_texture (void);
 void test_pipeline_shader_state (void);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index c7603e7e9..eab077b2c 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -32,6 +32,7 @@ cogl_tests = [
   [ 'test-alpha-textures', [] ],
   [ 'test-texture-get-set-data', [] ],
   [ 'test-framebuffer-get-bits', [] ],
+  [ 'test-primitive-and-journal', [] ],
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-primitive-and-journal.c b/src/tests/cogl/conform/test-primitive-and-journal.c
similarity index 96%
rename from cogl/tests/conform/test-primitive-and-journal.c
rename to src/tests/cogl/conform/test-primitive-and-journal.c
index 343812ca2..3f045d87b 100644
--- a/cogl/tests/conform/test-primitive-and-journal.c
+++ b/src/tests/cogl/conform/test-primitive-and-journal.c
@@ -1,7 +1,6 @@
 #include <cogl/cogl.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
 typedef CoglVertexP2C4 Vertex;
 
@@ -63,7 +62,7 @@ create_pipeline (void)
   return pipeline;
 }
 
-void
+static void
 test_primitive_and_journal (void)
 {
   CoglPrimitive *primitives[2];
@@ -118,3 +117,6 @@ test_primitive_and_journal (void)
     g_print ("OK\n");
 }
 
+COGL_TEST_SUITE (
+  g_test_add_func ("/primitive-and-journal", test_primitive_and_journal);
+)