diff --git a/src/Buffer.test.ts b/src/Buffer.test.ts
index 99bd6d0f..5ac71996 100644
--- a/src/Buffer.test.ts
+++ b/src/Buffer.test.ts
@@ -6,7 +6,7 @@ import { assert } from 'chai';
 import { ITerminal } from './Interfaces';
 import { Buffer } from './Buffer';
 import { CircularList } from './utils/CircularList';
-import { MockTerminal } from './utils/TestUtils';
+import { MockTerminal } from './utils/TestUtils.test';
 
 const INIT_COLS = 80;
 const INIT_ROWS = 24;
diff --git a/src/BufferSet.test.ts b/src/BufferSet.test.ts
index 97c07995..320241ca 100644
--- a/src/BufferSet.test.ts
+++ b/src/BufferSet.test.ts
@@ -6,7 +6,7 @@ import { assert } from 'chai';
 import { ITerminal } from './Interfaces';
 import { BufferSet } from './BufferSet';
 import { Buffer } from './Buffer';
-import { MockTerminal } from './utils/TestUtils';
+import { MockTerminal } from './utils/TestUtils.test';
 
 describe('BufferSet', () => {
   let terminal: ITerminal;
diff --git a/src/InputHandler.test.ts b/src/InputHandler.test.ts
index 043b7919..f6e07f7e 100644
--- a/src/InputHandler.test.ts
+++ b/src/InputHandler.test.ts
@@ -5,7 +5,7 @@
 import { assert } from 'chai';
 import { InputHandler } from './InputHandler';
 import { wcwidth } from './InputHandler';
-import { MockInputHandlingTerminal } from './utils/TestUtils';
+import { MockInputHandlingTerminal } from './utils/TestUtils.test';
 
 describe('InputHandler', () => {
   describe('save and restore cursor', () => {
diff --git a/src/SelectionManager.test.ts b/src/SelectionManager.test.ts
index c7fd9aef..4774b3bb 100644
--- a/src/SelectionManager.test.ts
+++ b/src/SelectionManager.test.ts
@@ -10,7 +10,7 @@ import { CircularList } from './utils/CircularList';
 import { SelectionManager } from './SelectionManager';
 import { SelectionModel } from './SelectionModel';
 import { BufferSet } from './BufferSet';
-import { MockTerminal } from './utils/TestUtils';
+import { MockTerminal } from './utils/TestUtils.test';
 import { LineData } from './Types';
 
 class TestSelectionManager extends SelectionManager {
diff --git a/src/SelectionModel.test.ts b/src/SelectionModel.test.ts
index 9da84478..6c750ed2 100644
--- a/src/SelectionModel.test.ts
+++ b/src/SelectionModel.test.ts
@@ -6,7 +6,7 @@ import { assert } from 'chai';
 import { ITerminal } from './Interfaces';
 import { SelectionModel } from './SelectionModel';
 import {BufferSet} from './BufferSet';
-import { MockTerminal } from './utils/TestUtils';
+import { MockTerminal } from './utils/TestUtils.test';
 
 class TestSelectionModel extends SelectionModel {
   constructor(
diff --git a/src/Terminal.test.ts b/src/Terminal.test.ts
index 753733c2..f045a37e 100644
--- a/src/Terminal.test.ts
+++ b/src/Terminal.test.ts
@@ -1,6 +1,6 @@
 import { assert, expect } from 'chai';
 import { Terminal } from './Terminal';
-import { MockViewport, MockCompositionHelper } from './utils/TestUtils';
+import { MockViewport, MockCompositionHelper } from './utils/TestUtils.test';
 import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX } from './Buffer';
 
 class TestTerminal extends Terminal {
diff --git a/src/utils/TestUtils.ts b/src/utils/TestUtils.test.ts
similarity index 100%
rename from src/utils/TestUtils.ts
rename to src/utils/TestUtils.test.ts