diff --git a/util/test/demos/d3d11/d3d11_1_many_uavs.cpp b/util/test/demos/d3d11/d3d11_1_many_uavs.cpp
index fdaa32086..21c3668c3 100644
--- a/util/test/demos/d3d11/d3d11_1_many_uavs.cpp
+++ b/util/test/demos/d3d11/d3d11_1_many_uavs.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Many_UAVs, D3D11GraphicsTest)
+RD_TEST(D3D11_Many_UAVs, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test using more than 8 compute shader UAVs (D3D11.1 feature)";
diff --git a/util/test/demos/d3d11/d3d11_array_interpolator.cpp b/util/test/demos/d3d11/d3d11_array_interpolator.cpp
index 72a2c2920..c3076487c 100644
--- a/util/test/demos/d3d11/d3d11_array_interpolator.cpp
+++ b/util/test/demos/d3d11/d3d11_array_interpolator.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Array_Interpolator, D3D11GraphicsTest)
+RD_TEST(D3D11_Array_Interpolator, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test passing an array of float2 to make sure the interpolator packing is handled by "
diff --git a/util/test/demos/d3d11/d3d11_binding_hazards.cpp b/util/test/demos/d3d11/d3d11_binding_hazards.cpp
index aefa7e8dd..06cfef4cd 100644
--- a/util/test/demos/d3d11/d3d11_binding_hazards.cpp
+++ b/util/test/demos/d3d11/d3d11_binding_hazards.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Binding_Hazards, D3D11GraphicsTest)
+RD_TEST(D3D11_Binding_Hazards, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Test of D3D11 hazard tracking write/read bindings";
 
diff --git a/util/test/demos/d3d11/d3d11_byte_address_buffers.cpp b/util/test/demos/d3d11/d3d11_byte_address_buffers.cpp
index 997763821..f620f37b6 100644
--- a/util/test/demos/d3d11/d3d11_byte_address_buffers.cpp
+++ b/util/test/demos/d3d11/d3d11_byte_address_buffers.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Byte_Address_Buffers, D3D11GraphicsTest)
+RD_TEST(D3D11_Byte_Address_Buffers, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Tests reading and writing from byte address buffers";
 
diff --git a/util/test/demos/d3d11/d3d11_cbuffer_zoo.cpp b/util/test/demos/d3d11/d3d11_cbuffer_zoo.cpp
index 2437a82b3..a2ab56c7b 100644
--- a/util/test/demos/d3d11/d3d11_cbuffer_zoo.cpp
+++ b/util/test/demos/d3d11/d3d11_cbuffer_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_CBuffer_Zoo, D3D11GraphicsTest)
+RD_TEST(D3D11_CBuffer_Zoo, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Tests every kind of constant that can be in a cbuffer to make sure it's decoded "
diff --git a/util/test/demos/d3d11/d3d11_counter_query_pred.cpp b/util/test/demos/d3d11/d3d11_counter_query_pred.cpp
index d2a173f60..4d7f5f9bc 100644
--- a/util/test/demos/d3d11/d3d11_counter_query_pred.cpp
+++ b/util/test/demos/d3d11/d3d11_counter_query_pred.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Counter_Query_Pred, D3D11GraphicsTest)
+RD_TEST(D3D11_Counter_Query_Pred, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Tests use of D3D11 counters, queries and predication. "
diff --git a/util/test/demos/d3d11/d3d11_deferred_updatesubresource.cpp b/util/test/demos/d3d11/d3d11_deferred_updatesubresource.cpp
index 3dfac6db7..6dfbce96a 100644
--- a/util/test/demos/d3d11/d3d11_deferred_updatesubresource.cpp
+++ b/util/test/demos/d3d11/d3d11_deferred_updatesubresource.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Deferred_UpdateSubresource, D3D11GraphicsTest)
+RD_TEST(D3D11_Deferred_UpdateSubresource, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test that does UpdateSubresource on a deferred context which might need some "
diff --git a/util/test/demos/d3d11/d3d11_discard_view.cpp b/util/test/demos/d3d11/d3d11_discard_view.cpp
index 568e87ecc..25d354f3c 100644
--- a/util/test/demos/d3d11/d3d11_discard_view.cpp
+++ b/util/test/demos/d3d11/d3d11_discard_view.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Discard_View, D3D11GraphicsTest)
+RD_TEST(D3D11_Discard_View, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Test that discards an RTV";
 
diff --git a/util/test/demos/d3d11/d3d11_divergent_shader.cpp b/util/test/demos/d3d11/d3d11_divergent_shader.cpp
index 7817ce354..eeca1ee17 100644
--- a/util/test/demos/d3d11/d3d11_divergent_shader.cpp
+++ b/util/test/demos/d3d11/d3d11_divergent_shader.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Divergent_Shader, D3D11GraphicsTest)
+RD_TEST(D3D11_Divergent_Shader, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test running a shader that diverges across a quad and then expects derivatives to "
diff --git a/util/test/demos/d3d11/d3d11_draw_zoo.cpp b/util/test/demos/d3d11/d3d11_draw_zoo.cpp
index cf4915460..48e04feb2 100644
--- a/util/test/demos/d3d11/d3d11_draw_zoo.cpp
+++ b/util/test/demos/d3d11/d3d11_draw_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Draw_Zoo, D3D11GraphicsTest)
+RD_TEST(D3D11_Draw_Zoo, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Draws several variants using different vertex/index offsets.";
diff --git a/util/test/demos/d3d11/d3d11_empty_compute_dispatch.cpp b/util/test/demos/d3d11/d3d11_empty_compute_dispatch.cpp
index 90c360a76..3495463f9 100644
--- a/util/test/demos/d3d11/d3d11_empty_compute_dispatch.cpp
+++ b/util/test/demos/d3d11/d3d11_empty_compute_dispatch.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Empty_Compute_Dispatch, D3D11GraphicsTest)
+RD_TEST(D3D11_Empty_Compute_Dispatch, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Test dispatching with one threadgroup count set to 0";
 
diff --git a/util/test/demos/d3d11/d3d11_empty_drawcall.cpp b/util/test/demos/d3d11/d3d11_empty_drawcall.cpp
index 8d24e387e..048061294 100644
--- a/util/test/demos/d3d11/d3d11_empty_drawcall.cpp
+++ b/util/test/demos/d3d11/d3d11_empty_drawcall.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Empty_Drawcall, D3D11GraphicsTest)
+RD_TEST(D3D11_Empty_Drawcall, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Test a drawcall of 0 size";
 
diff --git a/util/test/demos/d3d11/d3d11_empty_viewports.cpp b/util/test/demos/d3d11/d3d11_empty_viewports.cpp
index b18236ddd..62367d05f 100644
--- a/util/test/demos/d3d11/d3d11_empty_viewports.cpp
+++ b/util/test/demos/d3d11/d3d11_empty_viewports.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Empty_Viewports, D3D11GraphicsTest)
+RD_TEST(D3D11_Empty_Viewports, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test setting some viewports that are empty, but enabled";
diff --git a/util/test/demos/d3d11/d3d11_many_rtvs.cpp b/util/test/demos/d3d11/d3d11_many_rtvs.cpp
index 22bf178b1..44252bdda 100644
--- a/util/test/demos/d3d11/d3d11_many_rtvs.cpp
+++ b/util/test/demos/d3d11/d3d11_many_rtvs.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Many_RTVs, D3D11GraphicsTest)
+RD_TEST(D3D11_Many_RTVs, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Test repeatedly creating and destroying RTVs";
 
diff --git a/util/test/demos/d3d11/d3d11_map_overrun.cpp b/util/test/demos/d3d11/d3d11_map_overrun.cpp
index bde987321..a19e21386 100644
--- a/util/test/demos/d3d11/d3d11_map_overrun.cpp
+++ b/util/test/demos/d3d11/d3d11_map_overrun.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Map_Overrun, D3D11GraphicsTest)
+RD_TEST(D3D11_Map_Overrun, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Test overrunning the bounds of a Map() call";
 
diff --git a/util/test/demos/d3d11/d3d11_midframe_create.cpp b/util/test/demos/d3d11/d3d11_midframe_create.cpp
index 1430d1147..9c7179b31 100644
--- a/util/test/demos/d3d11/d3d11_midframe_create.cpp
+++ b/util/test/demos/d3d11/d3d11_midframe_create.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Midframe_Create, D3D11GraphicsTest)
+RD_TEST(D3D11_Midframe_Create, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Tests creating resources mid-frame to make sure that they and their contents are "
diff --git a/util/test/demos/d3d11/d3d11_mip_gen_rt.cpp b/util/test/demos/d3d11/d3d11_mip_gen_rt.cpp
index 744d0af59..9577d4094 100644
--- a/util/test/demos/d3d11/d3d11_mip_gen_rt.cpp
+++ b/util/test/demos/d3d11/d3d11_mip_gen_rt.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Mip_Gen_RT, D3D11GraphicsTest)
+RD_TEST(D3D11_Mip_Gen_RT, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Tests rendering from one mip to another to do a downsample chain";
diff --git a/util/test/demos/d3d11/d3d11_mip_rtv.cpp b/util/test/demos/d3d11/d3d11_mip_rtv.cpp
index 31232f8b7..7504da416 100644
--- a/util/test/demos/d3d11/d3d11_mip_rtv.cpp
+++ b/util/test/demos/d3d11/d3d11_mip_rtv.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Mip_RTV, D3D11GraphicsTest)
+RD_TEST(D3D11_Mip_RTV, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Test rendering into RTV mip levels";
 
diff --git a/util/test/demos/d3d11/d3d11_overdraw_stress.cpp b/util/test/demos/d3d11/d3d11_overdraw_stress.cpp
index 810959e58..59f67c239 100644
--- a/util/test/demos/d3d11/d3d11_overdraw_stress.cpp
+++ b/util/test/demos/d3d11/d3d11_overdraw_stress.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Overdraw_Stress, D3D11GraphicsTest)
+RD_TEST(D3D11_Overdraw_Stress, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Renders a lot of overlapping triangles";
 
diff --git a/util/test/demos/d3d11/d3d11_overlay_test.cpp b/util/test/demos/d3d11/d3d11_overlay_test.cpp
index 416fc4190..dd742ea52 100644
--- a/util/test/demos/d3d11/d3d11_overlay_test.cpp
+++ b/util/test/demos/d3d11/d3d11_overlay_test.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Overlay_Test, D3D11GraphicsTest)
+RD_TEST(D3D11_Overlay_Test, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Makes a couple of draws that show off all the overlays in some way";
diff --git a/util/test/demos/d3d11/d3d11_primitive_restart.cpp b/util/test/demos/d3d11/d3d11_primitive_restart.cpp
index 238c99ddd..28d53f9f6 100644
--- a/util/test/demos/d3d11/d3d11_primitive_restart.cpp
+++ b/util/test/demos/d3d11/d3d11_primitive_restart.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Primitive_Restart, D3D11GraphicsTest)
+RD_TEST(D3D11_Primitive_Restart, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test of primitive restart in triangle strips with -1 index";
diff --git a/util/test/demos/d3d11/d3d11_refcount_check.cpp b/util/test/demos/d3d11/d3d11_refcount_check.cpp
index c3e038dfd..c24c5d4a1 100644
--- a/util/test/demos/d3d11/d3d11_refcount_check.cpp
+++ b/util/test/demos/d3d11/d3d11_refcount_check.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Refcount_Check, D3D11GraphicsTest)
+RD_TEST(D3D11_Refcount_Check, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Ensures that the device etc doesn't delete itself when there are still outstanding "
diff --git a/util/test/demos/d3d11/d3d11_resource_lifetimes.cpp b/util/test/demos/d3d11/d3d11_resource_lifetimes.cpp
index c48964679..9763c37ba 100644
--- a/util/test/demos/d3d11/d3d11_resource_lifetimes.cpp
+++ b/util/test/demos/d3d11/d3d11_resource_lifetimes.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Resource_Lifetimes, D3D11GraphicsTest)
+RD_TEST(D3D11_Resource_Lifetimes, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test various edge-case resource lifetimes: a resource that is first dirtied within a frame "
diff --git a/util/test/demos/d3d11/d3d11_saturate.cpp b/util/test/demos/d3d11/d3d11_saturate.cpp
index 53141dad6..762110cc7 100644
--- a/util/test/demos/d3d11/d3d11_saturate.cpp
+++ b/util/test/demos/d3d11/d3d11_saturate.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Saturate, D3D11GraphicsTest)
+RD_TEST(D3D11_Saturate, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Tests using saturate, originally for a bug report";
 
diff --git a/util/test/demos/d3d11/d3d11_shader_debug_zoo.cpp b/util/test/demos/d3d11/d3d11_shader_debug_zoo.cpp
index ceb80a8da..415a57912 100644
--- a/util/test/demos/d3d11/d3d11_shader_debug_zoo.cpp
+++ b/util/test/demos/d3d11/d3d11_shader_debug_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Shader_Debug_Zoo, D3D11GraphicsTest)
+RD_TEST(D3D11_Shader_Debug_Zoo, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Tests shader debugging in different edge cases";
 
diff --git a/util/test/demos/d3d11/d3d11_simple_dispatch.cpp b/util/test/demos/d3d11/d3d11_simple_dispatch.cpp
index 54d883310..ce82afabc 100644
--- a/util/test/demos/d3d11/d3d11_simple_dispatch.cpp
+++ b/util/test/demos/d3d11/d3d11_simple_dispatch.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Simple_Dispatch, D3D11GraphicsTest)
+RD_TEST(D3D11_Simple_Dispatch, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test that just does a dispatch and some copies, for checking basic compute stuff";
diff --git a/util/test/demos/d3d11/d3d11_simple_triangle.cpp b/util/test/demos/d3d11/d3d11_simple_triangle.cpp
index 6d2706f4a..8563fa2fa 100644
--- a/util/test/demos/d3d11/d3d11_simple_triangle.cpp
+++ b/util/test/demos/d3d11/d3d11_simple_triangle.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Simple_Triangle, D3D11GraphicsTest)
+RD_TEST(D3D11_Simple_Triangle, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
diff --git a/util/test/demos/d3d11/d3d11_stream_out.cpp b/util/test/demos/d3d11/d3d11_stream_out.cpp
index f3de3db91..99e59fce7 100644
--- a/util/test/demos/d3d11/d3d11_stream_out.cpp
+++ b/util/test/demos/d3d11/d3d11_stream_out.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Stream_Out, D3D11GraphicsTest)
+RD_TEST(D3D11_Stream_Out, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Test using D3D11's streamout feature";
 
diff --git a/util/test/demos/d3d11/d3d11_stripped_shaders.cpp b/util/test/demos/d3d11/d3d11_stripped_shaders.cpp
index a9f45c715..276b876e0 100644
--- a/util/test/demos/d3d11/d3d11_stripped_shaders.cpp
+++ b/util/test/demos/d3d11/d3d11_stripped_shaders.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Stripped_Shaders, D3D11GraphicsTest)
+RD_TEST(D3D11_Stripped_Shaders, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Tests shaders with their debug/reflection info stripped out and stored in separate blobs";
diff --git a/util/test/demos/d3d11/d3d11_structured_buffer_misaligned_dirty.cpp b/util/test/demos/d3d11/d3d11_structured_buffer_misaligned_dirty.cpp
index 4370e0d63..e8dd5e371 100644
--- a/util/test/demos/d3d11/d3d11_structured_buffer_misaligned_dirty.cpp
+++ b/util/test/demos/d3d11/d3d11_structured_buffer_misaligned_dirty.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Structured_Buffer_MisalignedDirty, D3D11GraphicsTest)
+RD_TEST(D3D11_Structured_Buffer_MisalignedDirty, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test updating a misaligned chunk of a structured buffer";
diff --git a/util/test/demos/d3d11/d3d11_structured_buffer_nested.cpp b/util/test/demos/d3d11/d3d11_structured_buffer_nested.cpp
index 0f378c675..5836d2884 100644
--- a/util/test/demos/d3d11/d3d11_structured_buffer_nested.cpp
+++ b/util/test/demos/d3d11/d3d11_structured_buffer_nested.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Structured_Buffer_Nested, D3D11GraphicsTest)
+RD_TEST(D3D11_Structured_Buffer_Nested, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test reading from structured buffers with nested structs";
diff --git a/util/test/demos/d3d11/d3d11_structured_buffer_read.cpp b/util/test/demos/d3d11/d3d11_structured_buffer_read.cpp
index 339a897b1..3d4be5c98 100644
--- a/util/test/demos/d3d11/d3d11_structured_buffer_read.cpp
+++ b/util/test/demos/d3d11/d3d11_structured_buffer_read.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Structured_Buffer_Read, D3D11GraphicsTest)
+RD_TEST(D3D11_Structured_Buffer_Read, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Test reading from structured buffers, with and without offsets";
diff --git a/util/test/demos/d3d11/d3d11_texture_3d.cpp b/util/test/demos/d3d11/d3d11_texture_3d.cpp
index a6848e6b2..dfea5b759 100644
--- a/util/test/demos/d3d11/d3d11_texture_3d.cpp
+++ b/util/test/demos/d3d11/d3d11_texture_3d.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Texture_3D, D3D11GraphicsTest)
+RD_TEST(D3D11_Texture_3D, D3D11GraphicsTest)
 {
   static constexpr const char *Description = "Test that creates and samples a 3D texture";
 
diff --git a/util/test/demos/d3d11/d3d11_untyped_backbuffer_descriptor.cpp b/util/test/demos/d3d11/d3d11_untyped_backbuffer_descriptor.cpp
index b594793ec..6c89a2a24 100644
--- a/util/test/demos/d3d11/d3d11_untyped_backbuffer_descriptor.cpp
+++ b/util/test/demos/d3d11/d3d11_untyped_backbuffer_descriptor.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Untyped_Backbuffer_Descriptor, D3D11GraphicsTest)
+RD_TEST(D3D11_Untyped_Backbuffer_Descriptor, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
diff --git a/util/test/demos/d3d11/d3d11_vertex_attr_zoo.cpp b/util/test/demos/d3d11/d3d11_vertex_attr_zoo.cpp
index 75d6c6c72..55028788b 100644
--- a/util/test/demos/d3d11/d3d11_vertex_attr_zoo.cpp
+++ b/util/test/demos/d3d11/d3d11_vertex_attr_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d11_test.h"
 
-TEST(D3D11_Vertex_Attr_Zoo, D3D11GraphicsTest)
+RD_TEST(D3D11_Vertex_Attr_Zoo, D3D11GraphicsTest)
 {
   static constexpr const char *Description =
       "Draws a triangle but using different kinds of vertex attributes, including doubles, arrays, "
diff --git a/util/test/demos/d3d11/d3d11_video_textures.cpp b/util/test/demos/d3d11/d3d11_video_textures.cpp
index bf2d7e602..2edcb5af5 100644
--- a/util/test/demos/d3d11/d3d11_video_textures.cpp
+++ b/util/test/demos/d3d11/d3d11_video_textures.cpp
@@ -52,7 +52,7 @@ COM_SMARTPTR(IMFByteStream);
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////
 
-TEST(D3D11_Video_Textures, D3D11GraphicsTest), IMFMediaEngineNotify
+RD_TEST(D3D11_Video_Textures, D3D11GraphicsTest), IMFMediaEngineNotify
 {
   static constexpr const char *Description = "Tests of YUV textures";
 
diff --git a/util/test/demos/d3d12/d3d12_cbuffer_zoo.cpp b/util/test/demos/d3d12/d3d12_cbuffer_zoo.cpp
index 73500ed13..4cfc8dd05 100644
--- a/util/test/demos/d3d12/d3d12_cbuffer_zoo.cpp
+++ b/util/test/demos/d3d12/d3d12_cbuffer_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d12_test.h"
 
-TEST(D3D12_CBuffer_Zoo, D3D12GraphicsTest)
+RD_TEST(D3D12_CBuffer_Zoo, D3D12GraphicsTest)
 {
   static constexpr const char *Description =
       "Tests every kind of constant that can be in a cbuffer to make sure it's decoded "
diff --git a/util/test/demos/d3d12/d3d12_overlay_test.cpp b/util/test/demos/d3d12/d3d12_overlay_test.cpp
index 098398f6b..908b6ce38 100644
--- a/util/test/demos/d3d12/d3d12_overlay_test.cpp
+++ b/util/test/demos/d3d12/d3d12_overlay_test.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d12_test.h"
 
-TEST(D3D12_Overlay_Test, D3D12GraphicsTest)
+RD_TEST(D3D12_Overlay_Test, D3D12GraphicsTest)
 {
   static constexpr const char *Description =
       "Makes a couple of draws that show off all the overlays in some way";
diff --git a/util/test/demos/d3d12/d3d12_resource_lifetimes.cpp b/util/test/demos/d3d12/d3d12_resource_lifetimes.cpp
index 1e81160db..71165bc5f 100644
--- a/util/test/demos/d3d12/d3d12_resource_lifetimes.cpp
+++ b/util/test/demos/d3d12/d3d12_resource_lifetimes.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d12_test.h"
 
-TEST(D3D12_Resource_Lifetimes, D3D12GraphicsTest)
+RD_TEST(D3D12_Resource_Lifetimes, D3D12GraphicsTest)
 {
   static constexpr const char *Description =
       "Test various edge-case resource lifetimes: a resource that is first dirtied within a frame "
diff --git a/util/test/demos/d3d12/d3d12_simple_triangle.cpp b/util/test/demos/d3d12/d3d12_simple_triangle.cpp
index dd2f30928..6b2420813 100644
--- a/util/test/demos/d3d12/d3d12_simple_triangle.cpp
+++ b/util/test/demos/d3d12/d3d12_simple_triangle.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d12_test.h"
 
-TEST(D3D12_Simple_Triangle, D3D12GraphicsTest)
+RD_TEST(D3D12_Simple_Triangle, D3D12GraphicsTest)
 {
   static constexpr const char *Description =
       "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
diff --git a/util/test/demos/d3d12/d3d12_untyped_backbuffer_descriptor.cpp b/util/test/demos/d3d12/d3d12_untyped_backbuffer_descriptor.cpp
index c487e5175..766569660 100644
--- a/util/test/demos/d3d12/d3d12_untyped_backbuffer_descriptor.cpp
+++ b/util/test/demos/d3d12/d3d12_untyped_backbuffer_descriptor.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d12_test.h"
 
-TEST(D3D12_Untyped_Backbuffer_Descriptor, D3D12GraphicsTest)
+RD_TEST(D3D12_Untyped_Backbuffer_Descriptor, D3D12GraphicsTest)
 {
   static constexpr const char *Description =
       "D3D12 inherits D3D11's ability to have a mutable format on a non-typeless backbuffer "
diff --git a/util/test/demos/d3d12/d3d12_vertex_attr_zoo.cpp b/util/test/demos/d3d12/d3d12_vertex_attr_zoo.cpp
index a19631214..cfd4311e2 100644
--- a/util/test/demos/d3d12/d3d12_vertex_attr_zoo.cpp
+++ b/util/test/demos/d3d12/d3d12_vertex_attr_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "d3d12_test.h"
 
-TEST(D3D12_Vertex_Attr_Zoo, D3D12GraphicsTest)
+RD_TEST(D3D12_Vertex_Attr_Zoo, D3D12GraphicsTest)
 {
   static constexpr const char *Description =
       "Draws a triangle but using different kinds of vertex attributes, including doubles, arrays, "
diff --git a/util/test/demos/d3d12/d3d12_video_textures.cpp b/util/test/demos/d3d12/d3d12_video_textures.cpp
index be9a100ac..70e678a16 100644
--- a/util/test/demos/d3d12/d3d12_video_textures.cpp
+++ b/util/test/demos/d3d12/d3d12_video_textures.cpp
@@ -37,7 +37,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////
 
-TEST(D3D12_Video_Textures, D3D12GraphicsTest)
+RD_TEST(D3D12_Video_Textures, D3D12GraphicsTest)
 {
   static constexpr const char *Description = "Tests of YUV textures";
 
diff --git a/util/test/demos/gl/gl_buffer_updates.cpp b/util/test/demos/gl/gl_buffer_updates.cpp
index 94a798dbd..213c14955 100644
--- a/util/test/demos/gl/gl_buffer_updates.cpp
+++ b/util/test/demos/gl/gl_buffer_updates.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Buffer_Updates, OpenGLGraphicsTest)
+RD_TEST(GL_Buffer_Updates, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Test of buffer updates, both buffers that are updated regularly and get marked as "
diff --git a/util/test/demos/gl/gl_cbuffer_zoo.cpp b/util/test/demos/gl/gl_cbuffer_zoo.cpp
index 9285f6e9e..31ffd029f 100644
--- a/util/test/demos/gl/gl_cbuffer_zoo.cpp
+++ b/util/test/demos/gl/gl_cbuffer_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_CBuffer_Zoo, OpenGLGraphicsTest)
+RD_TEST(GL_CBuffer_Zoo, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Tests every kind of constant that can be in a cbuffer to make sure it's decoded "
diff --git a/util/test/demos/gl/gl_depthstencil_fbo.cpp b/util/test/demos/gl/gl_depthstencil_fbo.cpp
index c7858b949..d44af87e2 100644
--- a/util/test/demos/gl/gl_depthstencil_fbo.cpp
+++ b/util/test/demos/gl/gl_depthstencil_fbo.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_DepthStencil_FBO, OpenGLGraphicsTest)
+RD_TEST(GL_DepthStencil_FBO, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Creates a depth-stencil FBO and writes both depth and stencil to it";
diff --git a/util/test/demos/gl/gl_dx_interop.cpp b/util/test/demos/gl/gl_dx_interop.cpp
index fc1da1c57..d3fca3834 100644
--- a/util/test/demos/gl/gl_dx_interop.cpp
+++ b/util/test/demos/gl/gl_dx_interop.cpp
@@ -29,7 +29,7 @@
 
 #include "3rdparty/glad/glad_wgl.h"
 
-TEST(GL_DX_Interop, OpenGLGraphicsTest)
+RD_TEST(GL_DX_Interop, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Test interop between GL and DX (Create and render to a DX surface and include into "
diff --git a/util/test/demos/gl/gl_entry_points.cpp b/util/test/demos/gl/gl_entry_points.cpp
index 74086ecb8..c6298298b 100644
--- a/util/test/demos/gl/gl_entry_points.cpp
+++ b/util/test/demos/gl/gl_entry_points.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Entry_Points, OpenGLGraphicsTest)
+RD_TEST(GL_Entry_Points, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Test that RenderDoc correctly lists the different function call aliases used.";
diff --git a/util/test/demos/gl/gl_large_bcn_arrays.cpp b/util/test/demos/gl/gl_large_bcn_arrays.cpp
index 0aca751bd..7083aaddf 100644
--- a/util/test/demos/gl/gl_large_bcn_arrays.cpp
+++ b/util/test/demos/gl/gl_large_bcn_arrays.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Large_BCn_Arrays, OpenGLGraphicsTest)
+RD_TEST(GL_Large_BCn_Arrays, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Test creating large texture 2D arrays of BC4, BC5, BC6, BC7 textures";
diff --git a/util/test/demos/gl/gl_map_overrun.cpp b/util/test/demos/gl/gl_map_overrun.cpp
index 702ac018b..59bc8a44f 100644
--- a/util/test/demos/gl/gl_map_overrun.cpp
+++ b/util/test/demos/gl/gl_map_overrun.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Map_Overrun, OpenGLGraphicsTest)
+RD_TEST(GL_Map_Overrun, OpenGLGraphicsTest)
 {
   static constexpr const char *Description = "Test overrunning the bounds of a Map() call";
 
diff --git a/util/test/demos/gl/gl_midframe_context_create.cpp b/util/test/demos/gl/gl_midframe_context_create.cpp
index 7dcc3f009..db76e9612 100644
--- a/util/test/demos/gl/gl_midframe_context_create.cpp
+++ b/util/test/demos/gl/gl_midframe_context_create.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Midframe_Context_Create, OpenGLGraphicsTest)
+RD_TEST(GL_Midframe_Context_Create, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Creates a context and activates it in the middle of rendering.";
diff --git a/util/test/demos/gl/gl_mip_gen_rt.cpp b/util/test/demos/gl/gl_mip_gen_rt.cpp
index a1040f8e0..f2bc425a9 100644
--- a/util/test/demos/gl/gl_mip_gen_rt.cpp
+++ b/util/test/demos/gl/gl_mip_gen_rt.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Mip_Gen_RT, OpenGLGraphicsTest)
+RD_TEST(GL_Mip_Gen_RT, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Tests rendering from one mip to another to do a downsample chain";
diff --git a/util/test/demos/gl/gl_multi_window.cpp b/util/test/demos/gl/gl_multi_window.cpp
index 21c1da2fd..f59cfef68 100644
--- a/util/test/demos/gl/gl_multi_window.cpp
+++ b/util/test/demos/gl/gl_multi_window.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Multi_Window, OpenGLGraphicsTest)
+RD_TEST(GL_Multi_Window, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Render to two different windows to test out different contexts and window resolutions.";
diff --git a/util/test/demos/gl/gl_overlay_test.cpp b/util/test/demos/gl/gl_overlay_test.cpp
index 87a632600..faa21a030 100644
--- a/util/test/demos/gl/gl_overlay_test.cpp
+++ b/util/test/demos/gl/gl_overlay_test.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Overlay_Test, OpenGLGraphicsTest)
+RD_TEST(GL_Overlay_Test, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Makes a couple of draws that show off all the overlays in some way";
diff --git a/util/test/demos/gl/gl_parameter_zoo.cpp b/util/test/demos/gl/gl_parameter_zoo.cpp
index 0bdd3e397..1168a8150 100644
--- a/util/test/demos/gl/gl_parameter_zoo.cpp
+++ b/util/test/demos/gl/gl_parameter_zoo.cpp
@@ -31,7 +31,7 @@ extern "C" __declspec(dllexport) GLenum APIENTRY InternalFunction()
 }
 #endif
 
-TEST(GL_Parameter_Zoo, OpenGLGraphicsTest)
+RD_TEST(GL_Parameter_Zoo, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "General tests of parameters known to cause problems - e.g. optional values that should be "
diff --git a/util/test/demos/gl/gl_per_type_tex_units.cpp b/util/test/demos/gl/gl_per_type_tex_units.cpp
index 74478951f..d43fe67f2 100644
--- a/util/test/demos/gl/gl_per_type_tex_units.cpp
+++ b/util/test/demos/gl/gl_per_type_tex_units.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Per_Type_Tex_Units, OpenGLGraphicsTest)
+RD_TEST(GL_Per_Type_Tex_Units, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "GL lets each type (2D, 3D, Cube) have a different binding to the same texture unit. This "
diff --git a/util/test/demos/gl/gl_resource_lifetimes.cpp b/util/test/demos/gl/gl_resource_lifetimes.cpp
index 59f8e8aa8..0a3c6289f 100644
--- a/util/test/demos/gl/gl_resource_lifetimes.cpp
+++ b/util/test/demos/gl/gl_resource_lifetimes.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Resource_Lifetimes, OpenGLGraphicsTest)
+RD_TEST(GL_Resource_Lifetimes, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Test various edge-case resource lifetimes: a resource that is first dirtied within a frame "
diff --git a/util/test/demos/gl/gl_runtime_bind_prog_to_pipe.cpp b/util/test/demos/gl/gl_runtime_bind_prog_to_pipe.cpp
index 4d235ad48..c6cbbfb12 100644
--- a/util/test/demos/gl/gl_runtime_bind_prog_to_pipe.cpp
+++ b/util/test/demos/gl/gl_runtime_bind_prog_to_pipe.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Runtime_Bind_Prog_To_Pipe, OpenGLGraphicsTest)
+RD_TEST(GL_Runtime_Bind_Prog_To_Pipe, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Creates a single program pipeline and binds different programs to it mid-frame";
diff --git a/util/test/demos/gl/gl_separable_geometry_shader.cpp b/util/test/demos/gl/gl_separable_geometry_shader.cpp
index 152dd788b..08f7862e4 100644
--- a/util/test/demos/gl/gl_separable_geometry_shader.cpp
+++ b/util/test/demos/gl/gl_separable_geometry_shader.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Separable_Geometry_Shaders, OpenGLGraphicsTest)
+RD_TEST(GL_Separable_Geometry_Shaders, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws using geometry shadess and separable programs created with glCreateShaderProgramv";
diff --git a/util/test/demos/gl/gl_shader_editing.cpp b/util/test/demos/gl/gl_shader_editing.cpp
index 99a6fcf77..d20530ea5 100644
--- a/util/test/demos/gl/gl_shader_editing.cpp
+++ b/util/test/demos/gl/gl_shader_editing.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Shader_Editing, OpenGLGraphicsTest)
+RD_TEST(GL_Shader_Editing, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Ensures that shader editing works with different combinations of shader re-use and handles "
diff --git a/util/test/demos/gl/gl_simple_triangle.cpp b/util/test/demos/gl/gl_simple_triangle.cpp
index 495395370..109ea1ecf 100644
--- a/util/test/demos/gl/gl_simple_triangle.cpp
+++ b/util/test/demos/gl/gl_simple_triangle.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Simple_Triangle, OpenGLGraphicsTest)
+RD_TEST(GL_Simple_Triangle, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
diff --git a/util/test/demos/gl/gl_spirv_shader.cpp b/util/test/demos/gl/gl_spirv_shader.cpp
index b2016bfed..cfff8cfb0 100644
--- a/util/test/demos/gl/gl_spirv_shader.cpp
+++ b/util/test/demos/gl/gl_spirv_shader.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_SPIRV_Shader, OpenGLGraphicsTest)
+RD_TEST(GL_SPIRV_Shader, OpenGLGraphicsTest)
 {
   static constexpr const char *Description = "Draws using a SPIR-V shader pipeline.";
 
diff --git a/util/test/demos/gl/gl_structured_buffer_nested.cpp b/util/test/demos/gl/gl_structured_buffer_nested.cpp
index 2dceadb07..47915c7f8 100644
--- a/util/test/demos/gl/gl_structured_buffer_nested.cpp
+++ b/util/test/demos/gl/gl_structured_buffer_nested.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Structured_Buffer_Nested, OpenGLGraphicsTest)
+RD_TEST(GL_Structured_Buffer_Nested, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
diff --git a/util/test/demos/gl/gl_unsized_ms_fbo_attachment.cpp b/util/test/demos/gl/gl_unsized_ms_fbo_attachment.cpp
index 051124adf..deadad7c9 100644
--- a/util/test/demos/gl/gl_unsized_ms_fbo_attachment.cpp
+++ b/util/test/demos/gl/gl_unsized_ms_fbo_attachment.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Unsized_MS_FBO_Attachment, OpenGLGraphicsTest)
+RD_TEST(GL_Unsized_MS_FBO_Attachment, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Creates a MS FBO with one attachment created with an unsized internal format";
diff --git a/util/test/demos/gl/gl_vao_0.cpp b/util/test/demos/gl/gl_vao_0.cpp
index cfd45d51e..7bc4d8ceb 100644
--- a/util/test/demos/gl/gl_vao_0.cpp
+++ b/util/test/demos/gl/gl_vao_0.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_VAO_0, OpenGLGraphicsTest)
+RD_TEST(GL_VAO_0, OpenGLGraphicsTest)
 {
   static constexpr const char *Description = "Uses VAO 0 (i.e. never binds a VAO)";
 
diff --git a/util/test/demos/gl/gl_vertex_attr_zoo.cpp b/util/test/demos/gl/gl_vertex_attr_zoo.cpp
index f2502e80e..82f97e167 100644
--- a/util/test/demos/gl/gl_vertex_attr_zoo.cpp
+++ b/util/test/demos/gl/gl_vertex_attr_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "gl_test.h"
 
-TEST(GL_Vertex_Attr_Zoo, OpenGLGraphicsTest)
+RD_TEST(GL_Vertex_Attr_Zoo, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws a triangle but using different kinds of vertex attributes, including doubles, arrays, "
diff --git a/util/test/demos/test_common.h b/util/test/demos/test_common.h
index 992b67700..56229505b 100644
--- a/util/test/demos/test_common.h
+++ b/util/test/demos/test_common.h
@@ -228,7 +228,7 @@ struct TestMetadata
 
 void RegisterTest(TestMetadata test);
 
-#define TEST(Test, Parent)                \
+#define RD_TEST(Test, Parent)             \
   struct Test;                            \
   typedef Test CurrentTest;               \
   namespace                               \
diff --git a/util/test/demos/vk/vk_adv_cbuffer_zoo.cpp b/util/test/demos/vk/vk_adv_cbuffer_zoo.cpp
index 660e60ace..b0c6fad81 100644
--- a/util/test/demos/vk/vk_adv_cbuffer_zoo.cpp
+++ b/util/test/demos/vk/vk_adv_cbuffer_zoo.cpp
@@ -108,7 +108,7 @@ struct UBO
   int8_t test;
 };
 
-TEST(VK_Adv_CBuffer_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_Adv_CBuffer_Zoo, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Tests VK_EXT_scalar_block_layout as well as 8-bit/16-bit storage "
diff --git a/util/test/demos/vk/vk_buffer_address.cpp b/util/test/demos/vk/vk_buffer_address.cpp
index 066aeafe4..d3e20e5d9 100644
--- a/util/test/demos/vk/vk_buffer_address.cpp
+++ b/util/test/demos/vk/vk_buffer_address.cpp
@@ -30,7 +30,7 @@
 #if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || \
     defined(__ia64) || defined(_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
 
-TEST(VK_Buffer_Address, VulkanGraphicsTest)
+RD_TEST(VK_Buffer_Address, VulkanGraphicsTest)
 {
   static constexpr const char *Description = "Test capture and replay of VK_EXT_buffer_reference";
 
diff --git a/util/test/demos/vk/vk_cbuffer_zoo.cpp b/util/test/demos/vk/vk_cbuffer_zoo.cpp
index bc47a3cf5..cf94854dc 100644
--- a/util/test/demos/vk/vk_cbuffer_zoo.cpp
+++ b/util/test/demos/vk/vk_cbuffer_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_CBuffer_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_CBuffer_Zoo, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Tests every kind of constant that can be in a cbuffer to make sure it's decoded correctly.";
diff --git a/util/test/demos/vk/vk_descriptor_index.cpp b/util/test/demos/vk/vk_descriptor_index.cpp
index c0bb0928e..4f5a08e7b 100644
--- a/util/test/demos/vk/vk_descriptor_index.cpp
+++ b/util/test/demos/vk/vk_descriptor_index.cpp
@@ -47,7 +47,7 @@
 #define STRINGISE2(a) #a
 #define STRINGISE(a) STRINGISE2(a)
 
-TEST(VK_Descriptor_Indexing, VulkanGraphicsTest)
+RD_TEST(VK_Descriptor_Indexing, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws a triangle using descriptor indexing with large descriptor sets.";
diff --git a/util/test/demos/vk/vk_discard_rects.cpp b/util/test/demos/vk/vk_discard_rects.cpp
index f443bd9b5..b7dfda322 100644
--- a/util/test/demos/vk/vk_discard_rects.cpp
+++ b/util/test/demos/vk/vk_discard_rects.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Discard_Rectangles, VulkanGraphicsTest)
+RD_TEST(VK_Discard_Rectangles, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws a large number of triangles using VK_EXT_discard_rectangles discard rectangles to "
diff --git a/util/test/demos/vk/vk_draw_zoo.cpp b/util/test/demos/vk/vk_draw_zoo.cpp
index 2486ea4d0..d02d09094 100644
--- a/util/test/demos/vk/vk_draw_zoo.cpp
+++ b/util/test/demos/vk/vk_draw_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Draw_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_Draw_Zoo, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws several variants using different vertex/index offsets.";
diff --git a/util/test/demos/vk/vk_image_layouts.cpp b/util/test/demos/vk/vk_image_layouts.cpp
index d60a27131..2c3aa8842 100644
--- a/util/test/demos/vk/vk_image_layouts.cpp
+++ b/util/test/demos/vk/vk_image_layouts.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Image_Layouts, VulkanGraphicsTest)
+RD_TEST(VK_Image_Layouts, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Tests edge-cases of image layout transitions, such as images being in UNDEFINED, "
diff --git a/util/test/demos/vk/vk_imageless_framebuffer.cpp b/util/test/demos/vk/vk_imageless_framebuffer.cpp
index 28235284c..e46789727 100644
--- a/util/test/demos/vk/vk_imageless_framebuffer.cpp
+++ b/util/test/demos/vk/vk_imageless_framebuffer.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Imageless_Framebuffer, VulkanGraphicsTest)
+RD_TEST(VK_Imageless_Framebuffer, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Test using VK_KHR_imageless_framebuffer to specify image views at the last second";
diff --git a/util/test/demos/vk/vk_indirect.cpp b/util/test/demos/vk/vk_indirect.cpp
index cd111dfcc..2ae1ed32a 100644
--- a/util/test/demos/vk/vk_indirect.cpp
+++ b/util/test/demos/vk/vk_indirect.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Indirect, VulkanGraphicsTest)
+RD_TEST(VK_Indirect, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Tests different indirect drawing and dispatching functions, including parameters that are "
diff --git a/util/test/demos/vk/vk_int8_ibuffer.cpp b/util/test/demos/vk/vk_int8_ibuffer.cpp
index 4a21dd87b..48aa97b4c 100644
--- a/util/test/demos/vk/vk_int8_ibuffer.cpp
+++ b/util/test/demos/vk/vk_int8_ibuffer.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Int8_IBuffer, VulkanGraphicsTest)
+RD_TEST(VK_Int8_IBuffer, VulkanGraphicsTest)
 {
   static constexpr const char *Description = "Draws a triangle strip with 8-bit width indices";
 
diff --git a/util/test/demos/vk/vk_line_raster.cpp b/util/test/demos/vk/vk_line_raster.cpp
index da69226cf..7948c3c2a 100644
--- a/util/test/demos/vk/vk_line_raster.cpp
+++ b/util/test/demos/vk/vk_line_raster.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Line_Raster, VulkanGraphicsTest)
+RD_TEST(VK_Line_Raster, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Test using VK_EXT_line_rasterization to do funky rasterization of lines";
diff --git a/util/test/demos/vk/vk_misaligned_dirty.cpp b/util/test/demos/vk/vk_misaligned_dirty.cpp
index c08f5e59e..54a2125df 100644
--- a/util/test/demos/vk/vk_misaligned_dirty.cpp
+++ b/util/test/demos/vk/vk_misaligned_dirty.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Misaligned_Dirty, VulkanGraphicsTest)
+RD_TEST(VK_Misaligned_Dirty, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Generate a case where the initial states for a buffer end up being misaligned with what can "
diff --git a/util/test/demos/vk/vk_multi_thread_windows.cpp b/util/test/demos/vk/vk_multi_thread_windows.cpp
index 9ce905f04..dea8065ed 100644
--- a/util/test/demos/vk/vk_multi_thread_windows.cpp
+++ b/util/test/demos/vk/vk_multi_thread_windows.cpp
@@ -25,7 +25,7 @@
 #include <thread>
 #include "vk_test.h"
 
-TEST(VK_Multi_Thread_Windows, VulkanGraphicsTest)
+RD_TEST(VK_Multi_Thread_Windows, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws to as many windows as it can in parallel (one queue/thread per window).";
diff --git a/util/test/demos/vk/vk_overlay_test.cpp b/util/test/demos/vk/vk_overlay_test.cpp
index 8a63e1340..45c239e40 100644
--- a/util/test/demos/vk/vk_overlay_test.cpp
+++ b/util/test/demos/vk/vk_overlay_test.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Overlay_Test, VulkanGraphicsTest)
+RD_TEST(VK_Overlay_Test, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Makes a couple of draws that show off all the overlays in some way";
diff --git a/util/test/demos/vk/vk_parameter_zoo.cpp b/util/test/demos/vk/vk_parameter_zoo.cpp
index 6cdc9850a..7ec9f2a8a 100644
--- a/util/test/demos/vk/vk_parameter_zoo.cpp
+++ b/util/test/demos/vk/vk_parameter_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Parameter_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_Parameter_Zoo, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "General tests of parameters known to cause problems - e.g. optional values that should be "
diff --git a/util/test/demos/vk/vk_resource_lifetimes.cpp b/util/test/demos/vk/vk_resource_lifetimes.cpp
index 23b670839..ac968a608 100644
--- a/util/test/demos/vk/vk_resource_lifetimes.cpp
+++ b/util/test/demos/vk/vk_resource_lifetimes.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Resource_Lifetimes, VulkanGraphicsTest)
+RD_TEST(VK_Resource_Lifetimes, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Test various edge-case resource lifetimes: a resource that is first dirtied within a frame "
diff --git a/util/test/demos/vk/vk_sample_locations.cpp b/util/test/demos/vk/vk_sample_locations.cpp
index 5024a1139..939b0b999 100644
--- a/util/test/demos/vk/vk_sample_locations.cpp
+++ b/util/test/demos/vk/vk_sample_locations.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Sample_Locations, VulkanGraphicsTest)
+RD_TEST(VK_Sample_Locations, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws two triangles with different sample locations using VK_EXT_sample_locations";
diff --git a/util/test/demos/vk/vk_secondary_cmdbuf.cpp b/util/test/demos/vk/vk_secondary_cmdbuf.cpp
index f4cd15597..b13b860af 100644
--- a/util/test/demos/vk/vk_secondary_cmdbuf.cpp
+++ b/util/test/demos/vk/vk_secondary_cmdbuf.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Secondary_CmdBuf, VulkanGraphicsTest)
+RD_TEST(VK_Secondary_CmdBuf, VulkanGraphicsTest)
 {
   static constexpr const char *Description = "Draw using secondary command buffers";
 
diff --git a/util/test/demos/vk/vk_shader_editing.cpp b/util/test/demos/vk/vk_shader_editing.cpp
index e3f200f0e..eb5e963ea 100644
--- a/util/test/demos/vk/vk_shader_editing.cpp
+++ b/util/test/demos/vk/vk_shader_editing.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Shader_Editing, VulkanGraphicsTest)
+RD_TEST(VK_Shader_Editing, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Ensures that shader editing works with different combinations of shader re-use.";
diff --git a/util/test/demos/vk/vk_simple_triangle.cpp b/util/test/demos/vk/vk_simple_triangle.cpp
index e6986bbac..54a7f6caa 100644
--- a/util/test/demos/vk/vk_simple_triangle.cpp
+++ b/util/test/demos/vk/vk_simple_triangle.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Simple_Triangle, VulkanGraphicsTest)
+RD_TEST(VK_Simple_Triangle, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
diff --git a/util/test/demos/vk/vk_spec_constants.cpp b/util/test/demos/vk/vk_spec_constants.cpp
index 015da2610..6123f091b 100644
--- a/util/test/demos/vk/vk_spec_constants.cpp
+++ b/util/test/demos/vk/vk_spec_constants.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Spec_Constants, VulkanGraphicsTest)
+RD_TEST(VK_Spec_Constants, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Tests using the same shader multiple times with specialisation constants";
diff --git a/util/test/demos/vk/vk_spirv_13_shaders.cpp b/util/test/demos/vk/vk_spirv_13_shaders.cpp
index 7d2e22111..235f235ea 100644
--- a/util/test/demos/vk/vk_spirv_13_shaders.cpp
+++ b/util/test/demos/vk/vk_spirv_13_shaders.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_SPIRV_13_Shaders, VulkanGraphicsTest)
+RD_TEST(VK_SPIRV_13_Shaders, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws a triangle using SPIR-V 1.3 shaders to ensure they are handled correctly.";
diff --git a/util/test/demos/vk/vk_structured_buffer_nested.cpp b/util/test/demos/vk/vk_structured_buffer_nested.cpp
index 04f3a1461..425fa8425 100644
--- a/util/test/demos/vk/vk_structured_buffer_nested.cpp
+++ b/util/test/demos/vk/vk_structured_buffer_nested.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Structured_Buffer_Nested, VulkanGraphicsTest)
+RD_TEST(VK_Structured_Buffer_Nested, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Just draws a simple triangle, using normal pipeline. Basic test that can be used "
diff --git a/util/test/demos/vk/vk_triangle_fan.cpp b/util/test/demos/vk/vk_triangle_fan.cpp
index 375bf1cc2..ec0292604 100644
--- a/util/test/demos/vk/vk_triangle_fan.cpp
+++ b/util/test/demos/vk/vk_triangle_fan.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Triangle_Fan, VulkanGraphicsTest)
+RD_TEST(VK_Triangle_Fan, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws a triangle fan with primitive restart to test different edge cases.";
diff --git a/util/test/demos/vk/vk_vertex_attr_zoo.cpp b/util/test/demos/vk/vk_vertex_attr_zoo.cpp
index 46616bc43..15875918d 100644
--- a/util/test/demos/vk/vk_vertex_attr_zoo.cpp
+++ b/util/test/demos/vk/vk_vertex_attr_zoo.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_Vertex_Attr_Zoo, VulkanGraphicsTest)
+RD_TEST(VK_Vertex_Attr_Zoo, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Draws a triangle but using different kinds of vertex attributes, including doubles, arrays, "
diff --git a/util/test/demos/vk/vk_video_textures.cpp b/util/test/demos/vk/vk_video_textures.cpp
index 4df818f2d..8a29bd99d 100644
--- a/util/test/demos/vk/vk_video_textures.cpp
+++ b/util/test/demos/vk/vk_video_textures.cpp
@@ -37,7 +37,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////
 
-TEST(VK_Video_Textures, VulkanGraphicsTest)
+RD_TEST(VK_Video_Textures, VulkanGraphicsTest)
 {
   static constexpr const char *Description = "Tests of YUV textures";
 
diff --git a/util/test/demos/vk/vk_vs_max_desc_set.cpp b/util/test/demos/vk/vk_vs_max_desc_set.cpp
index 82ae76935..f4a404811 100644
--- a/util/test/demos/vk/vk_vs_max_desc_set.cpp
+++ b/util/test/demos/vk/vk_vs_max_desc_set.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-TEST(VK_VS_Max_Desc_Set, VulkanGraphicsTest)
+RD_TEST(VK_VS_Max_Desc_Set, VulkanGraphicsTest)
 {
   static constexpr const char *Description =
       "Uses the device's maximum number of descriptor sets in the vertex shader.";