diff --git a/tests-ui/tests/store/executionStore.executingNode.test.ts b/tests-ui/tests/store/executionStore.executingNode.test.ts
deleted file mode 100644
index 005ecc084..000000000
--- a/tests-ui/tests/store/executionStore.executingNode.test.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
-import { useExecutionStore } from '@/stores/executionStore'
-import {
-  createTestSubgraph,
-  createTestSubgraphNode
-} from '../litegraph/subgraph/fixtures/subgraphHelpers'
-
-// Mock factory function to create a root graph
-const createMockRootGraph = (
-  options: Partial<Pick<LGraph, 'getNodeById' | 'nodes'>> = {}
-): Partial<LGraph> => ({
-  getNodeById: options.getNodeById ?? vi.fn(() => null),
-  nodes: options.nodes ?? [],
-  ...options
-})
-
-// Keep track of the current mock root graph
-const mockAppState = {
-  rootGraph: createMockRootGraph()
-}
-// Mock the app import and its rootGraph property
-vi.mock('@/scripts/app', () => ({
-  app: {
-    get rootGraph() {
-      return mockAppState.rootGraph
-    },
-    set rootGraph(value) {
-      mockAppState.rootGraph = value
-    },
-    revokePreviews: vi.fn(),
-    nodePreviewImages: {}
-  }
-}))
-// Mock the workflowStore
-vi.mock(
-  '@/platform/workflow/management/stores/workflowStore',
-  async (importOriginal) => {
-    const { ComfyWorkflow } =
-      await importOriginal<
-        typeof import('@/platform/workflow/management/stores/workflowStore')
-      >()
-    const mockNodeExecutionIdToNodeLocatorId = vi.fn()
-    const mockNodeIdToNodeLocatorId = vi.fn()
-    const mockNodeLocatorIdToNodeExecutionId = vi.fn()
-
-    return {
-      ComfyWorkflow,
-      useWorkflowStore: vi.fn(() => ({
-        nodeExecutionIdToNodeLocatorId: mockNodeExecutionIdToNodeLocatorId,
-        nodeIdToNodeLocatorId: mockNodeIdToNodeLocatorId,
-        nodeLocatorIdToNodeExecutionId: mockNodeLocatorIdToNodeExecutionId
-      }))
-    }
-  }
-)
-
-vi.mock('@/composables/node/useNodeProgressText', () => ({
-  useNodeProgressText: () => ({
-    showTextPreview: vi.fn()
-  })
-}))
-
-describe('useExecutionStore - executingNode with subgraphs', () => {
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    vi.clearAllMocks()
-
-    // Reset the mock root graph using factory
-    mockAppState.rootGraph = createMockRootGraph()
-  })
-
-  it('should find executing node in root graph', () => {
-    const mockNode = {
-      id: '123',
-      title: 'Test Node',
-      type: 'TestNode'
-    } as LGraphNode
-
-    mockAppState.rootGraph = createMockRootGraph({
-      getNodeById: vi.fn((id) => (id === '123' ? mockNode : null))
-    })
-
-    const store = useExecutionStore()
-
-    // Simulate node execution starting
-    store.nodeProgressStates = {
-      '123': {
-        state: 'running',
-        value: 0,
-        max: 100,
-        display_node_id: '123',
-        prompt_id: 'test-prompt',
-        node_id: '123'
-      }
-    }
-
-    expect(store.executingNode).toBe(mockNode)
-  })
-
-  it('should find executing node in subgraph using execution ID', () => {
-    const mockNodeInSubgraph = {
-      id: '789',
-      title: 'Nested Node',
-      type: 'NestedNode'
-    } as LGraphNode
-
-    // Create a real subgraph with the test helper
-    const testSubgraph = createTestSubgraph({
-      id: 'sub-uuid'
-    })
-    // Add the mock node to the subgraph
-    testSubgraph._nodes.push(mockNodeInSubgraph)
-
-    // Create a subgraph node using the helper
-    const mockSubgraphNode = createTestSubgraphNode(testSubgraph, {
-      id: '456'
-    })
-
-    // Mock the subgraph's getNodeById to return our mock node
-    vi.spyOn(testSubgraph, 'getNodeById').mockImplementation(
-      (id: string | number | null | undefined) =>
-        id === '789' ? mockNodeInSubgraph : null
-    )
-
-    mockAppState.rootGraph = createMockRootGraph({
-      getNodeById: vi.fn((id) => (id === '456' ? mockSubgraphNode : null))
-    })
-
-    const store = useExecutionStore()
-
-    // Simulate node execution in subgraph with hierarchical execution ID "456:789"
-    store.nodeProgressStates = {
-      '456:789': {
-        state: 'running',
-        value: 0,
-        max: 100,
-        display_node_id: '456:789',
-        prompt_id: 'test-prompt',
-        node_id: '456:789'
-      }
-    }
-
-    // The executingNode should resolve to the nested node
-    expect(store.executingNode).toBe(mockNodeInSubgraph)
-  })
-
-  it('should return null when no node is executing', () => {
-    const store = useExecutionStore()
-
-    store.nodeProgressStates = {}
-
-    expect(store.executingNode).toBeNull()
-  })
-
-  it('should return null when executing node cannot be found', () => {
-    mockAppState.rootGraph = createMockRootGraph({
-      getNodeById: vi.fn(() => null)
-    })
-
-    const store = useExecutionStore()
-
-    store.nodeProgressStates = {
-      '999': {
-        state: 'running',
-        value: 0,
-        max: 100,
-        display_node_id: '999',
-        prompt_id: 'test-prompt',
-        node_id: '999'
-      }
-    }
-
-    expect(store.executingNode).toBeNull()
-  })
-})
diff --git a/tests-ui/tests/store/executionStore.test.ts b/tests-ui/tests/store/executionStore.test.ts
index 7c893bd60..7b192f785 100644
--- a/tests-ui/tests/store/executionStore.test.ts
+++ b/tests-ui/tests/store/executionStore.test.ts
@@ -4,6 +4,12 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { app } from '@/scripts/app'
 import { useExecutionStore } from '@/stores/executionStore'
 
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '../litegraph/subgraph/fixtures/subgraphHelpers'
+
 // Create mock functions that will be shared
 const mockNodeExecutionIdToNodeLocatorId = vi.fn()
 const mockNodeIdToNodeLocatorId = vi.fn()
@@ -297,3 +303,103 @@ describe('useExecutionStore - Node Error Lookups', () => {
     })
   })
 })
+
+describe('useExecutionStore - executingNode with subgraphs', () => {
+  let store: ReturnType<typeof useExecutionStore>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createPinia())
+    store = useExecutionStore()
+  })
+
+  it('should find executing node in root graph', () => {
+    const mockNode = {
+      id: '123',
+      title: 'Test Node',
+      type: 'TestNode'
+    } as LGraphNode
+
+    vi.mocked(app.rootGraph.getNodeById).mockReturnValue(mockNode)
+
+    // Simulate node execution starting
+    store.nodeProgressStates = {
+      '123': {
+        state: 'running',
+        value: 0,
+        max: 100,
+        display_node_id: '123',
+        prompt_id: 'test-prompt',
+        node_id: '123'
+      }
+    }
+
+    expect(store.executingNode).toBe(mockNode)
+  })
+
+  it('should find executing node in subgraph using execution ID', () => {
+    const mockNodeInSubgraph = {
+      id: '789',
+      title: 'Nested Node',
+      type: 'NestedNode'
+    } as LGraphNode
+
+    // Create a real subgraph with the test helper
+    const testSubgraph = createTestSubgraph({
+      id: 'sub-uuid'
+    })
+    // Add the mock node to the subgraph
+    testSubgraph._nodes.push(mockNodeInSubgraph)
+
+    // Create a subgraph node using the helper
+    const mockSubgraphNode = createTestSubgraphNode(testSubgraph, {
+      id: '456'
+    })
+
+    // Mock the subgraph's getNodeById to return our mock node
+    vi.spyOn(testSubgraph, 'getNodeById').mockImplementation(
+      (id: string | number | null | undefined) =>
+        id === '789' ? mockNodeInSubgraph : null
+    )
+
+    vi.mocked(app.rootGraph.getNodeById).mockReturnValue(mockSubgraphNode)
+
+    // Simulate node execution in subgraph with hierarchical execution ID "456:789"
+    store.nodeProgressStates = {
+      '456:789': {
+        state: 'running',
+        value: 0,
+        max: 100,
+        display_node_id: '456:789',
+        prompt_id: 'test-prompt',
+        node_id: '456:789'
+      }
+    }
+
+    // The executingNode should resolve to the nested node
+    expect(store.executingNode).toBe(mockNodeInSubgraph)
+  })
+
+  it('should return null when no node is executing', () => {
+    store.nodeProgressStates = {}
+
+    expect(store.executingNode).toBeNull()
+  })
+
+  it('should return null when executing node cannot be found', () => {
+    vi.mocked(app.rootGraph.getNodeById).mockReturnValue(null)
+
+    store.nodeProgressStates = {
+      '999': {
+        state: 'running',
+        value: 0,
+        max: 100,
+        display_node_id: '999',
+        prompt_id: 'test-prompt',
+        node_id: '999'
+      }
+    }
+
+    expect(store.executingNode).toBeNull()
+  })
+})