diff --git a/tools/cmake/depgraph.cmake b/tools/cmake/depgraph.cmake
index fc312db7ad..9e80666265 100644
--- a/tools/cmake/depgraph.cmake
+++ b/tools/cmake/depgraph.cmake
@@ -35,10 +35,10 @@ function(depgraph_add_edge dep_from dep_to)
         # However, show which components are "common" by adding an edge from a node named "common".
         # If necessary, add a new build property to customize this behavior.
         if(NOT dep_from IN_LIST common_reqs)
-            idf_build_set_property(__BUILD_COMPONENT_DEPGRAPH "common -> ${dep_to}" APPEND)
+            idf_build_set_property(__BUILD_COMPONENT_DEPGRAPH "\"common\" -> \"${dep_to}\"" APPEND)
         endif()
     else()
-        idf_build_set_property(__BUILD_COMPONENT_DEPGRAPH "${dep_from} -> ${dep_to} ${attr}" APPEND)
+        idf_build_set_property(__BUILD_COMPONENT_DEPGRAPH "\"${dep_from}\" -> \"${dep_to}\" ${attr}" APPEND)
     endif()
 endfunction()
 
diff --git a/tools/test_apps/system/g1_components/check_dependencies.py b/tools/test_apps/system/g1_components/check_dependencies.py
index 3f0e8e7c1b..08a7f310f2 100644
--- a/tools/test_apps/system/g1_components/check_dependencies.py
+++ b/tools/test_apps/system/g1_components/check_dependencies.py
@@ -26,8 +26,8 @@ def parse_dependencies(file_path: str) -> Tuple[Dict[str, List[str]], List[str]]
                 parts = line.split(' -> ')
 
                 if (len(parts) >= 2):
-                    source = parts[0]
-                    target = parts[1].split()[0]  # Extracting the target component
+                    source = parts[0].strip('"')
+                    target = parts[1].split()[0].strip('"')  # Extracting the target component
                     logging.debug(f'Parsed dependency: {source} -> {target}')
 
                     # Check that g1/g0 dependencies are either on the list of expected violations