11 files changed, 13 insertions, 21 deletions
diff --git a/cli/tests/testdata/cat.ts b/cli/tests/testdata/cat.ts
index 6d8f150e3..c2a500b3e 100644
--- a/cli/tests/testdata/cat.ts
+++ b/cli/tests/testdata/cat.ts
@@ -1,4 +1,4 @@
-import { copy } from "../../../test_util/std/io/util.ts";
+import { copy } from "../../../test_util/std/streams/copy.ts";
 async function main() {
   for (let i = 1; i < Deno.args.length; i++) {
     const filename = Deno.args[i];
diff --git a/cli/tests/testdata/echo_server.ts b/cli/tests/testdata/echo_server.ts
index b23867cdd..658b07374 100644
--- a/cli/tests/testdata/echo_server.ts
+++ b/cli/tests/testdata/echo_server.ts
@@ -1,4 +1,4 @@
-import { copy } from "../../../test_util/std/io/util.ts";
+import { copy } from "../../../test_util/std/streams/copy.ts";
 const addr = Deno.args[0] || "0.0.0.0:4544";
 const [hostname, port] = addr.split(":");
 const listener = Deno.listen({ hostname, port: Number(port) });
diff --git a/cli/tests/testdata/run/textproto.ts b/cli/tests/testdata/run/textproto.ts
index 7ddb79717..62c4f5979 100644
--- a/cli/tests/testdata/run/textproto.ts
+++ b/cli/tests/testdata/run/textproto.ts
@@ -17,8 +17,8 @@
 import type {
   BufReader,
   ReadLineResult,
-} from "../../../../test_util/std/io/buffer.ts";
-import { concat } from "../../../../test_util/std/bytes/mod.ts";
+} from "../../../../test_util/std/io/buf_reader.ts";
+import { concat } from "../../../../test_util/std/bytes/concat.ts";
 
 // Constants created for DRY
 const CHAR_SPACE: number = " ".charCodeAt(0);
diff --git a/cli/tests/testdata/run/tls_connecttls.js b/cli/tests/testdata/run/tls_connecttls.js
index aea60151a..7c03856cb 100644
--- a/cli/tests/testdata/run/tls_connecttls.js
+++ b/cli/tests/testdata/run/tls_connecttls.js
@@ -3,7 +3,7 @@ import {
   assert,
   assertEquals,
 } from "../../../../test_util/std/testing/asserts.ts";
-import { BufReader, BufWriter } from "../../../../test_util/std/io/buffer.ts";
+import { BufReader, BufWriter } from "../../../../test_util/std/io/mod.ts";
 import { TextProtoReader } from "./textproto.ts";
 
 const encoder = new TextEncoder();
diff --git a/cli/tests/testdata/test/ops_sanitizer_missing_details.ts b/cli/tests/testdata/test/ops_sanitizer_missing_details.ts
index 406773129..e3b07d77a 100644
--- a/cli/tests/testdata/test/ops_sanitizer_missing_details.ts
+++ b/cli/tests/testdata/test/ops_sanitizer_missing_details.ts
@@ -1,6 +1,6 @@
 // https://github.com/denoland/deno/issues/13729
 // https://github.com/denoland/deno/issues/13938
-import { writeAll } from "../../../../test_util/std/io/util.ts";
+import { writeAll } from "../../../../test_util/std/streams/write_all.ts";
 
 Deno.test("test 1", { permissions: { write: true, read: true } }, async () => {
   const tmpFile = await Deno.makeTempFile();
diff --git a/cli/tests/unit/blob_test.ts b/cli/tests/unit/blob_test.ts
index 8a91a76dd..4c81c2cbc 100644
--- a/cli/tests/unit/blob_test.ts
+++ b/cli/tests/unit/blob_test.ts
@@ -1,6 +1,6 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 import { assert, assertEquals, assertStringIncludes } from "./test_util.ts";
-import { concat } from "../../../test_util/std/bytes/mod.ts";
+import { concat } from "../../../test_util/std/bytes/concat.ts";
 
 Deno.test(function blobString() {
   const b1 = new Blob(["Hello World"]);
diff --git a/cli/tests/unit/files_test.ts b/cli/tests/unit/files_test.ts
index c45f7072f..c30ef2a71 100644
--- a/cli/tests/unit/files_test.ts
+++ b/cli/tests/unit/files_test.ts
@@ -8,7 +8,7 @@ import {
   assertRejects,
   assertThrows,
 } from "./test_util.ts";
-import { copy } from "../../../test_util/std/streams/conversion.ts";
+import { copy } from "../../../test_util/std/streams/copy.ts";
 
 Deno.test(function filesStdioFileDescriptors() {
   assertEquals(Deno.stdin.rid, 0);
diff --git a/cli/tests/unit/flash_test.ts b/cli/tests/unit/flash_test.ts
index 706b9f72b..98249385b 100644
--- a/cli/tests/unit/flash_test.ts
+++ b/cli/tests/unit/flash_test.ts
@@ -2,11 +2,7 @@
 
 // deno-lint-ignore-file
 
-import {
-  Buffer,
-  BufReader,
-  BufWriter,
-} from "../../../test_util/std/io/buffer.ts";
+import { Buffer, BufReader, BufWriter } from "../../../test_util/std/io/mod.ts";
 import { TextProtoReader } from "../testdata/run/textproto.ts";
 import {
   assert,
diff --git a/cli/tests/unit/http_test.ts b/cli/tests/unit/http_test.ts
index 3c6c86a69..331570a84 100644
--- a/cli/tests/unit/http_test.ts
+++ b/cli/tests/unit/http_test.ts
@@ -1,9 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import {
-  Buffer,
-  BufReader,
-  BufWriter,
-} from "../../../test_util/std/io/buffer.ts";
+import { Buffer, BufReader, BufWriter } from "../../../test_util/std/io/mod.ts";
 import { TextProtoReader } from "../testdata/run/textproto.ts";
 import { serve, serveTls } from "../../../test_util/std/http/server.ts";
 import {
diff --git a/cli/tests/unit/test_util.ts b/cli/tests/unit/test_util.ts
index 09102d330..dc7f698c5 100644
--- a/cli/tests/unit/test_util.ts
+++ b/cli/tests/unit/test_util.ts
@@ -20,7 +20,7 @@ export {
 export { deferred } from "../../../test_util/std/async/deferred.ts";
 export type { Deferred } from "../../../test_util/std/async/deferred.ts";
 export { delay } from "../../../test_util/std/async/delay.ts";
-export { readLines } from "../../../test_util/std/io/buffer.ts";
+export { readLines } from "../../../test_util/std/io/read_lines.ts";
 export { parse as parseArgs } from "../../../test_util/std/flags/mod.ts";
 
 export function pathToAbsoluteFileUrl(path: string): URL {
diff --git a/cli/tests/unit/tls_test.ts b/cli/tests/unit/tls_test.ts
index 393e57dfa..b7cde1020 100644
--- a/cli/tests/unit/tls_test.ts
+++ b/cli/tests/unit/tls_test.ts
@@ -9,8 +9,8 @@ import {
   Deferred,
   deferred,
 } from "./test_util.ts";
-import { BufReader, BufWriter } from "../../../test_util/std/io/buffer.ts";
-import { readAll } from "../../../test_util/std/streams/conversion.ts";
+import { BufReader, BufWriter } from "../../../test_util/std/io/mod.ts";
+import { readAll } from "../../../test_util/std/streams/read_all.ts";
 import { TextProtoReader } from "../testdata/run/textproto.ts";
 
 const encoder = new TextEncoder();