diff --git a/types/list-stream/list-stream-tests.ts b/types/list-stream/list-stream-tests.ts
index 3648097ad6..89b0d6c236 100644
--- a/types/list-stream/list-stream-tests.ts
+++ b/types/list-stream/list-stream-tests.ts
@@ -1,54 +1,2 @@
-import ListStream from "list-stream";
-
-let chunk: any = "chunk";
-let listStream: ListStream;
-let num = 1;
-
-listStream = ListStream((err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-listStream = ListStream({ objectMode: true }, (err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-listStream = new ListStream((err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-listStream = new ListStream({ objectMode: true }, (err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-listStream = ListStream.obj((err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-
-listStream = ListStream.obj();
-listStream.write({ key: "value" });
-
-listStream.append(chunk);
-
-listStream = listStream.duplicate();
-
-listStream.end();
-
-chunk = listStream.get(num);
-
-num = listStream.length;
+import "./tests/import-tests";
+import "./tests/require-tests";
diff --git a/types/list-stream/tests/import-tests.ts b/types/list-stream/tests/import-tests.ts
new file mode 100644
index 0000000000..3648097ad6
--- /dev/null
+++ b/types/list-stream/tests/import-tests.ts
@@ -0,0 +1,54 @@
+import ListStream from "list-stream";
+
+let chunk: any = "chunk";
+let listStream: ListStream;
+let num = 1;
+
+listStream = ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = new ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = new ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream.obj((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+
+listStream = ListStream.obj();
+listStream.write({ key: "value" });
+
+listStream.append(chunk);
+
+listStream = listStream.duplicate();
+
+listStream.end();
+
+chunk = listStream.get(num);
+
+num = listStream.length;
diff --git a/types/list-stream/tests/require-tests.ts b/types/list-stream/tests/require-tests.ts
new file mode 100644
index 0000000000..8966e1e5a3
--- /dev/null
+++ b/types/list-stream/tests/require-tests.ts
@@ -0,0 +1,54 @@
+import ListStream = require("list-stream");
+
+let chunk: any = "chunk";
+let listStream: ListStream;
+let num = 1;
+
+listStream = ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = new ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = new ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream.obj((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+
+listStream = ListStream.obj();
+listStream.write({ key: "value" });
+
+listStream.append(chunk);
+
+listStream = listStream.duplicate();
+
+listStream.end();
+
+chunk = listStream.get(num);
+
+num = listStream.length;