diff --git a/CHANGELIST.md b/CHANGELIST.md
index a1b6a14c..d0fd4063 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -162,6 +162,7 @@
 - Fix one DIC parameter test
 - Ensure setting defaults are consistent
 - Move ToRedumper* back to EnumExtensions
+- Rearrange test classes to match new format
 
 ### 3.1.9a (2024-05-21)
 
diff --git a/MPF.Test/Modules/DiscImageCreatorTests.cs b/MPF.Test/ExecutionContexts/DiscImageCreatorTests.cs
similarity index 99%
rename from MPF.Test/Modules/DiscImageCreatorTests.cs
rename to MPF.Test/ExecutionContexts/DiscImageCreatorTests.cs
index 67a1bb5b..f11ce181 100644
--- a/MPF.Test/Modules/DiscImageCreatorTests.cs
+++ b/MPF.Test/ExecutionContexts/DiscImageCreatorTests.cs
@@ -5,7 +5,7 @@ using MPF.Frontend;
 using SabreTools.RedumpLib.Data;
 using Xunit;
 
-namespace MPF.Test.Modules
+namespace MPF.Test.ExecutionContexts
 {
     public class DiscImageCreatorTests
     {
diff --git a/MPF.Test/UI/AllowedSpeedsTest.cs b/MPF.Test/Frontend/AllowedSpeedsTest.cs
similarity index 95%
rename from MPF.Test/UI/AllowedSpeedsTest.cs
rename to MPF.Test/Frontend/AllowedSpeedsTest.cs
index 0b13cf3e..2aa6b620 100644
--- a/MPF.Test/UI/AllowedSpeedsTest.cs
+++ b/MPF.Test/Frontend/AllowedSpeedsTest.cs
@@ -2,7 +2,7 @@
 using SabreTools.RedumpLib.Data;
 using Xunit;
 
-namespace MPF.Test.Data
+namespace MPF.Test.Frontend
 {
     public class UIElementsTest
     {
diff --git a/MPF.Test/Library/DumpEnvironmentTests.cs b/MPF.Test/Frontend/DumpEnvironmentTests.cs
similarity index 97%
rename from MPF.Test/Library/DumpEnvironmentTests.cs
rename to MPF.Test/Frontend/DumpEnvironmentTests.cs
index 8c1d24f5..e892bdf5 100644
--- a/MPF.Test/Library/DumpEnvironmentTests.cs
+++ b/MPF.Test/Frontend/DumpEnvironmentTests.cs
@@ -2,7 +2,7 @@
 using SabreTools.RedumpLib.Data;
 using Xunit;
 
-namespace MPF.Test.Library
+namespace MPF.Test.Frontend
 {
     public class DumpEnvironmentTests
     {
diff --git a/MPF.Test/Core/Converters/EnumConverterTests.cs b/MPF.Test/Frontend/EnumConverterTests.cs
similarity index 98%
rename from MPF.Test/Core/Converters/EnumConverterTests.cs
rename to MPF.Test/Frontend/EnumConverterTests.cs
index f5e1136b..af3c144a 100644
--- a/MPF.Test/Core/Converters/EnumConverterTests.cs
+++ b/MPF.Test/Frontend/EnumConverterTests.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using MPF.Frontend;
 using Xunit;
 
-namespace MPF.Test.Core.Converters
+namespace MPF.Test.Frontend
 {
     public class EnumConverterTests
     {
diff --git a/MPF.Test/Core/Data/ResultTests.cs b/MPF.Test/Frontend/ResultEventArgsTests.cs
similarity index 93%
rename from MPF.Test/Core/Data/ResultTests.cs
rename to MPF.Test/Frontend/ResultEventArgsTests.cs
index 4ba69bfa..a65f1a33 100644
--- a/MPF.Test/Core/Data/ResultTests.cs
+++ b/MPF.Test/Frontend/ResultEventArgsTests.cs
@@ -1,9 +1,9 @@
 using MPF.Frontend;
 using Xunit;
 
-namespace MPF.Test.Core.Data
+namespace MPF.Test.Frontend
 {
-    public class ResultTests
+    public class ResultEventArgsTests
     {
         [Fact]
         public void EmptySuccessTest()
diff --git a/MPF.Test/Library/InfoToolTests.cs b/MPF.Test/Frontend/Tools/InfoToolTests.cs
similarity index 99%
rename from MPF.Test/Library/InfoToolTests.cs
rename to MPF.Test/Frontend/Tools/InfoToolTests.cs
index fe56df51..32ff8e40 100644
--- a/MPF.Test/Library/InfoToolTests.cs
+++ b/MPF.Test/Frontend/Tools/InfoToolTests.cs
@@ -5,7 +5,7 @@ using SabreTools.RedumpLib;
 using SabreTools.RedumpLib.Data;
 using Xunit;
 
-namespace MPF.Test.Library
+namespace MPF.Test.Frontend.Tools
 {
     public class InfoToolTests
     {
diff --git a/MPF.Test/Library/ProtectionTests.cs b/MPF.Test/Frontend/Tools/ProtectionTests.cs
similarity index 99%
rename from MPF.Test/Library/ProtectionTests.cs
rename to MPF.Test/Frontend/Tools/ProtectionTests.cs
index f18b1a10..ee7a6910 100644
--- a/MPF.Test/Library/ProtectionTests.cs
+++ b/MPF.Test/Frontend/Tools/ProtectionTests.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using MPF.Frontend.Tools;
 using Xunit;
 
-namespace MPF.Test.Library
+namespace MPF.Test.Frontend.Tools
 {
     public class ProtectionTests
     {
diff --git a/MPF.Test/Core/Utilities/EnumExtensionsTests.cs b/MPF.Test/RedumpLib/EnumExtensionsTests.cs
similarity index 99%
rename from MPF.Test/Core/Utilities/EnumExtensionsTests.cs
rename to MPF.Test/RedumpLib/EnumExtensionsTests.cs
index cf09fc12..f96b9ce1 100644
--- a/MPF.Test/Core/Utilities/EnumExtensionsTests.cs
+++ b/MPF.Test/RedumpLib/EnumExtensionsTests.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using SabreTools.RedumpLib.Data;
 using Xunit;
 
-namespace MPF.Test.Core.Utilities
+namespace MPF.Test.RedumpLib
 {
     public class EnumExtensionsTests
     {