diff --git a/extension/src/test/suite/cli/cwd.test.ts b/extension/src/test/suite/cli/dvc/cwd.test.ts
similarity index 91%
rename from extension/src/test/suite/cli/cwd.test.ts
rename to extension/src/test/suite/cli/dvc/cwd.test.ts
index 5db494878a..2b2aa64953 100644
--- a/extension/src/test/suite/cli/cwd.test.ts
+++ b/extension/src/test/suite/cli/dvc/cwd.test.ts
@@ -1,8 +1,8 @@
 import { sep } from 'path'
 import { describe, it, suite } from 'mocha'
 import { expect } from 'chai'
-import { dvcDemoPath } from '../../util'
-import { getCaseSensitiveCwd } from '../../../cli/dvc/cwd'
+import { dvcDemoPath } from '../../../util'
+import { getCaseSensitiveCwd } from '../../../../cli/dvc/cwd'
 
 suite('Cwd Test Suite', () => {
   describe('getCaseSensitiveCwd', () => {
diff --git a/extension/src/test/suite/cli/runner.test.ts b/extension/src/test/suite/cli/dvc/runner.test.ts
similarity index 89%
rename from extension/src/test/suite/cli/runner.test.ts
rename to extension/src/test/suite/cli/dvc/runner.test.ts
index 86451fb54b..95d72fd554 100644
--- a/extension/src/test/suite/cli/runner.test.ts
+++ b/extension/src/test/suite/cli/dvc/runner.test.ts
@@ -2,16 +2,16 @@ import { afterEach, beforeEach, describe, it, suite } from 'mocha'
 import { expect } from 'chai'
 import { restore, spy, stub } from 'sinon'
 import { window, Event, EventEmitter } from 'vscode'
-import { Disposable, Disposer } from '../../../extension'
-import { Config } from '../../../config'
-import { DvcRunner } from '../../../cli/dvc/runner'
-import { CliResult, CliStarted } from '../../../cli'
-import * as Telemetry from '../../../telemetry'
-import { EventName } from '../../../telemetry/constants'
-import { WEBVIEW_TEST_TIMEOUT } from '../timeouts'
-import { spyOnPrivateMemberMethod } from '../util'
-
-suite('CLI Runner Test Suite', () => {
+import { Disposable, Disposer } from '../../../../extension'
+import { Config } from '../../../../config'
+import { DvcRunner } from '../../../../cli/dvc/runner'
+import { CliResult, CliStarted } from '../../../../cli'
+import * as Telemetry from '../../../../telemetry'
+import { EventName } from '../../../../telemetry/constants'
+import { WEBVIEW_TEST_TIMEOUT } from '../../timeouts'
+import { spyOnPrivateMemberMethod } from '../../util'
+
+suite('DVC Runner Test Suite', () => {
   const disposable = Disposable.fn()
 
   beforeEach(() => {
@@ -22,7 +22,7 @@ suite('CLI Runner Test Suite', () => {
     disposable.dispose()
   })
 
-  describe('dvcRunner', () => {
+  describe('DvcRunner', () => {
     it('should only be able to run a single command at a time', async () => {
       const dvcRunner = disposable.track(new DvcRunner({} as Config, 'sleep'))