diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
index a863807d..f1d889f7 100644
--- a/test/integration/CMakeLists.txt
+++ b/test/integration/CMakeLists.txt
@@ -5,6 +5,10 @@ if (SKIP_av OR INTERNAL_SKIP_av)
   list(REMOVE_ITEM tests video_encoder.cc)
 endif()
 
+if (SKIP_graphics OR INTERNAL_SKIP_graphics)
+  list(REMOVE_ITEM tests mesh.cc)
+endif()
+
 gz_build_tests(
   TYPE INTEGRATION
   SOURCES ${tests}
@@ -19,14 +23,16 @@ if(TARGET INTEGRATION_plugin)
   target_include_directories(INTEGRATION_plugin PRIVATE ${PROJECT_SOURCE_DIR}/test)
 endif()
 
+# Graphics specific integration tests
 if(TARGET INTEGRATION_mesh)
   target_link_libraries(INTEGRATION_mesh ${PROJECT_LIBRARY_TARGET_NAME}-graphics)
 endif()
 
-if(TARGET INTEGRATION_encoder_timing)
-  target_link_libraries(INTEGRATION_encoder_timing ${PROJECT_LIBRARY_TARGET_NAME}-av)
-endif()
-
+# AV specific integration tests
 if(TARGET INTEGRATION_video_encoder)
   target_link_libraries(INTEGRATION_video_encoder ${PROJECT_LIBRARY_TARGET_NAME}-av)
 endif()
+
+if(TARGET INTEGRATION_encoder_timing)
+  target_link_libraries(INTEGRATION_encoder_timing ${PROJECT_LIBRARY_TARGET_NAME}-av)
+endif()