diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index 19f5355ab..0cf1021d4 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-journal.c',
   'test-primitive.c',
   'test-sparse-pipeline.c',
   'test-read-texture-formats.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 43fddfd74..ae1b24aad 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -80,7 +80,6 @@ main (int argc, char **argv)
 
   ADD_TEST (test_primitive, 0, 0);
 
-  ADD_TEST (test_journal_unref_flush, 0, 0);
   ADD_TEST (test_framebuffer_get_bits,
             TEST_REQUIREMENT_GL,
             0);
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
index a6ea2d871..4a31ad05f 100644
--- a/cogl/tests/conform/test-declarations.h
+++ b/cogl/tests/conform/test-declarations.h
@@ -13,7 +13,6 @@ void test_read_texture_formats (void);
 void test_write_texture_formats (void);
 void test_alpha_textures (void);
 void test_primitive (void);
-void test_journal_unref_flush (void);
 void test_framebuffer_get_bits (void);
 void test_point_size (void);
 void test_point_size_attribute (void);
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index 4c01621ed..7c02b443a 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -15,6 +15,7 @@ cogl_tests = [
   'test-sub-texture',
   'test-custom-attributes',
   'test-offscreen',
+  'test-journal',
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-journal.c b/src/tests/cogl/conform/test-journal.c
similarity index 90%
rename from cogl/tests/conform/test-journal.c
rename to src/tests/cogl/conform/test-journal.c
index ec93e528f..3b16ee3a8 100644
--- a/cogl/tests/conform/test-journal.c
+++ b/src/tests/cogl/conform/test-journal.c
@@ -3,10 +3,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-declarations.h"
-#include "test-utils.h"
+#include "tests/cogl-test-utils.h"
 
-void
+static void
 test_journal_unref_flush (void)
 {
   CoglTexture2D *texture;
@@ -44,3 +43,7 @@ test_journal_unref_flush (void)
 
   cogl_object_unref (texture);
 }
+
+COGL_TEST_SUITE (
+  g_test_add_func ("/journal/unref-flush", test_journal_unref_flush);
+)