diff --git a/src/BizHawk.Tests/Client.Common/Movie/LogGeneratorTests.cs b/src/BizHawk.Tests/Client.Common/Movie/LogGeneratorTests.cs
index d7b433d650..4e4a33fc57 100644
--- a/src/BizHawk.Tests/Client.Common/Movie/LogGeneratorTests.cs
+++ b/src/BizHawk.Tests/Client.Common/Movie/LogGeneratorTests.cs
@@ -3,7 +3,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Common.Tests.Client.Common.Movie
+namespace BizHawk.Tests.Client.Common.Movie
 {
 	[TestClass]
 	public class LogGeneratorTests
diff --git a/src/BizHawk.Tests/Client.Common/Movie/MovieConversionExtensionTests.cs b/src/BizHawk.Tests/Client.Common/Movie/MovieConversionExtensionTests.cs
index fd299aa4df..95b18ef784 100644
--- a/src/BizHawk.Tests/Client.Common/Movie/MovieConversionExtensionTests.cs
+++ b/src/BizHawk.Tests/Client.Common/Movie/MovieConversionExtensionTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using BizHawk.Client.Common;
 
-namespace BizHawk.Common.Tests.Client.Common.Movie
+namespace BizHawk.Tests.Client.Common.Movie
 {
 	[TestClass]
 	public class MovieConversionExtensionTests
diff --git a/src/BizHawk.Tests/Client.Common/Movie/MovieServiceTests.cs b/src/BizHawk.Tests/Client.Common/Movie/MovieServiceTests.cs
index ace5d5ab01..a9c20cf14d 100644
--- a/src/BizHawk.Tests/Client.Common/Movie/MovieServiceTests.cs
+++ b/src/BizHawk.Tests/Client.Common/Movie/MovieServiceTests.cs
@@ -1,7 +1,7 @@
 using BizHawk.Client.Common;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace BizHawk.Common.Tests.Client.Common.Movie
+namespace BizHawk.Tests.Client.Common.Movie
 {
 	[TestClass]
 	public class MovieServiceTests
diff --git a/src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs b/src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs
index a72e7eaecc..658cd9ace6 100644
--- a/src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs
+++ b/src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs
@@ -3,7 +3,7 @@ using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace BizHawk.Common.Tests.Client.Common.Movie
+namespace BizHawk.Tests.Client.Common.Movie
 {
 	[TestClass]
 	public class ZwinderStateManagerTests
diff --git a/src/BizHawk.Tests/Common/MultiPredicateSort/MultiPredicateSortTests.cs b/src/BizHawk.Tests/Common/MultiPredicateSort/MultiPredicateSortTests.cs
index 6307b8c20c..6d97411ec4 100644
--- a/src/BizHawk.Tests/Common/MultiPredicateSort/MultiPredicateSortTests.cs
+++ b/src/BizHawk.Tests/Common/MultiPredicateSort/MultiPredicateSortTests.cs
@@ -4,7 +4,7 @@ using System.Linq;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace BizHawk.Common.Tests.Common.MultiPredicateSort
+namespace BizHawk.Tests.Common.MultiPredicateSort
 {
 	[TestClass]
 	public class MultiPredicateSortTests
diff --git a/src/BizHawk.Tests/Common/StringExtensions/StringExtensionTests.cs b/src/BizHawk.Tests/Common/StringExtensions/StringExtensionTests.cs
index fe9fe51f17..ba261011cb 100644
--- a/src/BizHawk.Tests/Common/StringExtensions/StringExtensionTests.cs
+++ b/src/BizHawk.Tests/Common/StringExtensions/StringExtensionTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using BizHawk.Common.StringExtensions;
 
-namespace BizHawk.Common.Tests.Common.StringExtensions
+namespace BizHawk.Tests.Common.StringExtensions
 {
 	[TestClass]
 	public class StringExtensionTests