diff --git a/src/docker-manager-cleanup.test.ts b/src/docker-manager-cleanup.test.ts
index 160c097e3..ff0b1bbf8 100644
--- a/src/docker-manager-cleanup.test.ts
+++ b/src/docker-manager-cleanup.test.ts
@@ -1,4 +1,5 @@
-import { writeConfigs, cleanup, collectDiagnosticLogs, preserveIptablesAudit } from './docker-manager';
+import { writeConfigs } from './config-writer';
+import { cleanup, collectDiagnosticLogs, preserveIptablesAudit } from './container-cleanup';
 import { WrapperConfig } from './types';
 import * as fs from 'fs';
 import * as path from 'path';
diff --git a/src/docker-manager-lifecycle.test.ts b/src/docker-manager-lifecycle.test.ts
index e68eff0eb..dd9424cef 100644
--- a/src/docker-manager-lifecycle.test.ts
+++ b/src/docker-manager-lifecycle.test.ts
@@ -1,5 +1,11 @@
-import { startContainers, runAgentCommand, fastKillAgentContainer, setAwfDockerHost, stopContainers, getLocalDockerEnv } from './docker-manager';
-import { containerLifecycleTestHelpers } from './container-lifecycle';
+import {
+  startContainers,
+  runAgentCommand,
+  fastKillAgentContainer,
+  containerLifecycleTestHelpers,
+} from './container-lifecycle';
+import { setAwfDockerHost, getLocalDockerEnv } from './docker-host';
+import { stopContainers } from './container-cleanup';
 import { AGENT_CONTAINER_NAME } from './constants';
 import { logger } from './logger';
 import * as fs from 'fs';
diff --git a/src/docker-manager-utils.test.ts b/src/docker-manager-utils.test.ts
index 2b36bd3d7..64355f5a4 100644
--- a/src/docker-manager-utils.test.ts
+++ b/src/docker-manager-utils.test.ts
@@ -4,6 +4,7 @@ import {
   getSafeHostGid,
   getRealUserHome,
   stripScheme,
+  parseDifcProxyHost,
 } from './host-env';
 import {
   validateIdNotInSystemRange,
@@ -18,7 +19,6 @@ import {
   parseGitHubEnvFile,
   readEnvFile,
 } from './github-env';
-import { parseDifcProxyHost } from './docker-manager';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';