diff --git a/Assets/Mirror/Tests/Editor/Tools/AccurateIntervalTests.cs b/Assets/Mirror/Tests/Editor/Tools/AccurateIntervalTests.cs
index dc1384826..1bdfc2486 100644
--- a/Assets/Mirror/Tests/Editor/Tools/AccurateIntervalTests.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/AccurateIntervalTests.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Mirror.Tests
+namespace Mirror.Tests.Tools
 {
     public class AccurateIntervalTests
     {
diff --git a/Assets/Mirror/Tests/Editor/Tools/CompressionTests.cs b/Assets/Mirror/Tests/Editor/Tools/CompressionTests.cs
index 195837e5c..9313e24d5 100644
--- a/Assets/Mirror/Tests/Editor/Tools/CompressionTests.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/CompressionTests.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using UnityEngine;
 
-namespace Mirror.Tests
+namespace Mirror.Tests.Tools
 {
     public class CompressionTests
     {
diff --git a/Assets/Mirror/Tests/Editor/Tools/DeltaCompressionTests.cs b/Assets/Mirror/Tests/Editor/Tools/DeltaCompressionTests.cs
index 32d1e4bef..7d3c3abed 100644
--- a/Assets/Mirror/Tests/Editor/Tools/DeltaCompressionTests.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/DeltaCompressionTests.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Mirror.Tests
+namespace Mirror.Tests.Tools
 {
     public class DeltaCompressionTests
     {
diff --git a/Assets/Mirror/Tests/Editor/Tools/ExponentialMovingAverageTests.cs b/Assets/Mirror/Tests/Editor/Tools/ExponentialMovingAverageTests.cs
index 7255934b9..12f23c0d3 100644
--- a/Assets/Mirror/Tests/Editor/Tools/ExponentialMovingAverageTests.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/ExponentialMovingAverageTests.cs
@@ -1,7 +1,7 @@
 // tests from Mirror
 using NUnit.Framework;
 
-namespace Mirror.Tests
+namespace Mirror.Tests.Tools
 {
     [TestFixture]
     public class ExponentialMovingAverageTest
diff --git a/Assets/Mirror/Tests/Editor/Tools/ExtensionsTest.cs b/Assets/Mirror/Tests/Editor/Tools/ExtensionsTest.cs
index 7b84cbd3e..07c71afa5 100644
--- a/Assets/Mirror/Tests/Editor/Tools/ExtensionsTest.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/ExtensionsTest.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using NUnit.Framework;
 
-namespace Mirror.Tests
+namespace Mirror.Tests.Tools
 {
     public class ExtensionsTest
     {
diff --git a/Assets/Mirror/Tests/Editor/Tools/MathdTests.cs b/Assets/Mirror/Tests/Editor/Tools/MathdTests.cs
index bf237c99f..b20ca3d3c 100644
--- a/Assets/Mirror/Tests/Editor/Tools/MathdTests.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/MathdTests.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Mirror.Tests
+namespace Mirror.Tests.Tools
 {
     public class MathdTests
     {
diff --git a/Assets/Mirror/Tests/Editor/Tools/PoolTests.cs b/Assets/Mirror/Tests/Editor/Tools/PoolTests.cs
index 2f6928561..cd1ad692c 100644
--- a/Assets/Mirror/Tests/Editor/Tools/PoolTests.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/PoolTests.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Mirror.Tests
+namespace Mirror.Tests.Tools
 {
     public class PoolTests
     {
diff --git a/Assets/Mirror/Tests/Editor/Tools/TimeSampleTests.cs b/Assets/Mirror/Tests/Editor/Tools/TimeSampleTests.cs
index 0f755e8eb..39819d223 100644
--- a/Assets/Mirror/Tests/Editor/Tools/TimeSampleTests.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/TimeSampleTests.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using System.Threading;
 
-namespace Mirror.Tests.Editor
+namespace Mirror.Tests.Tools
 {
     public class TimeSampleTests
     {
diff --git a/Assets/Mirror/Tests/Editor/Tools/UtilsTests.cs b/Assets/Mirror/Tests/Editor/Tools/UtilsTests.cs
index d46e7e390..bb84ef78f 100644
--- a/Assets/Mirror/Tests/Editor/Tools/UtilsTests.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/UtilsTests.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using UnityEngine;
 
-namespace Mirror.Tests
+namespace Mirror.Tests.Tools
 {
     public class UtilsTests
     {
diff --git a/Assets/Mirror/Tests/Editor/Tools/Vector3LongTests.cs b/Assets/Mirror/Tests/Editor/Tools/Vector3LongTests.cs
index 91d95518b..8e09f6e08 100644
--- a/Assets/Mirror/Tests/Editor/Tools/Vector3LongTests.cs
+++ b/Assets/Mirror/Tests/Editor/Tools/Vector3LongTests.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace Mirror.Tests
+namespace Mirror.Tests.Tools
 {
     public class Vector3LongTests
     {