5 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/tests/unit/SConscript b/src/gallium/tests/unit/SConscript
index 0650804018b..4465396334f 100644
--- a/src/gallium/tests/unit/SConscript
+++ b/src/gallium/tests/unit/SConscript
@@ -13,8 +13,6 @@ if env['platform'] == 'freebsd8':
 progs = [
     'pipe_barrier_test',
     'u_cache_test',
-    'u_format_test',
-    'u_format_compatible_test',
     'u_half_test',
     'translate_test'
 ]
diff --git a/src/gallium/tests/unit/meson.build b/src/gallium/tests/unit/meson.build
index 976218f22b7..3a6badace7e 100644
--- a/src/gallium/tests/unit/meson.build
+++ b/src/gallium/tests/unit/meson.build
@@ -19,8 +19,7 @@
 # SOFTWARE.
 
 foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
-             'u_format_test', 'u_format_compatible_test', 'translate_test',
-             'u_prim_verts_test' ]
+             'translate_test', 'u_prim_verts_test']
   exe = executable(
     t,
     '@[email protected]'.format(t),
diff --git a/src/util/tests/format/meson.build b/src/util/tests/format/meson.build
index 663bf691d1f..6f4b91cf810 100644
--- a/src/util/tests/format/meson.build
+++ b/src/util/tests/format/meson.build
@@ -1,4 +1,4 @@
-foreach t : ['srgb']
+foreach t : ['srgb', 'u_format_test', 'u_format_compatible_test']
   test(t,
     executable(
       t,
diff --git a/src/gallium/tests/unit/u_format_compatible_test.c b/src/util/tests/format/u_format_compatible_test.c
index 6d3ce5efa8a..6d3ce5efa8a 100644
--- a/src/gallium/tests/unit/u_format_compatible_test.c
+++ b/src/util/tests/format/u_format_compatible_test.c
diff --git a/src/gallium/tests/unit/u_format_test.c b/src/util/tests/format/u_format_test.c
index 69e3b5aebfd..69e3b5aebfd 100644
--- a/src/gallium/tests/unit/u_format_test.c
+++ b/src/util/tests/format/u_format_test.c