diff --git a/Content.IntegrationTests/Tests/BuckleTest.cs b/Content.IntegrationTests/Tests/BuckleTest.cs
index 1de145d509..34049ade76 100644
--- a/Content.IntegrationTests/Tests/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/BuckleTest.cs
@@ -60,7 +60,7 @@ namespace Content.IntegrationTests.Tests
                 Assert.False(ActionBlockerSystem.CanMove(human));
                 Assert.False(ActionBlockerSystem.CanChangeDirection(human));
                 Assert.False(EffectBlockerSystem.CanFall(human));
-                Assert.AreEqual(human.Transform.WorldPosition, chair.Transform.WorldPosition);
+                Assert.That(human.Transform.WorldPosition, Is.EqualTo(chair.Transform.WorldPosition));
 
                 // Side effects of buckling for the strap
                 Assert.That(strap.BuckledEntities, Does.Contain(human));
diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs
index 3abe58f685..dcf9b23d3f 100644
--- a/Content.IntegrationTests/Tests/GravityGridTest.cs
+++ b/Content.IntegrationTests/Tests/GravityGridTest.cs
@@ -44,7 +44,7 @@ namespace Content.IntegrationTests.Tests
                 Assert.That(generator.HasComponent<PowerReceiverComponent>());
                 var generatorComponent = generator.GetComponent<GravityGeneratorComponent>();
                 var powerComponent = generator.GetComponent<PowerReceiverComponent>();
-                Assert.AreEqual(generatorComponent.Status, GravityGeneratorStatus.Unpowered);
+                Assert.That(generatorComponent.Status, Is.EqualTo(GravityGeneratorStatus.Unpowered));
                 powerComponent.NeedsPower = false;
             });
             server.RunTicks(1);
@@ -53,7 +53,7 @@ namespace Content.IntegrationTests.Tests
             {
                 var generatorComponent = generator.GetComponent<GravityGeneratorComponent>();
 
-                Assert.AreEqual(generatorComponent.Status, GravityGeneratorStatus.On);
+                Assert.That(generatorComponent.Status, Is.EqualTo(GravityGeneratorStatus.On));
 
                 Assert.That(!grid1.HasGravity);
                 Assert.That(grid2.HasGravity);
diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
index d9950ae04b..05c3a6f243 100644
--- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
+++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
@@ -55,15 +55,15 @@ namespace Content.IntegrationTests.Tests
                 if(!mapManager.TryFindGridAt(new MapId(10), new Vector2(10,10), out var mapGrid))
                     Assert.Fail();
 
-                Assert.AreEqual(new Vector2(10, 10), mapGrid.WorldPosition);
-                Assert.AreEqual(new Tile(1, 512), mapGrid.GetTileRef(new MapIndices(0, 0)).Tile);
+                Assert.That(mapGrid.WorldPosition, Is.EqualTo(new Vector2(10, 10)));
+                Assert.That(mapGrid.GetTileRef(new MapIndices(0, 0)).Tile, Is.EqualTo(new Tile(1, 512)));
             }
             {
                 if (!mapManager.TryFindGridAt(new MapId(10), new Vector2(-8, -8), out var mapGrid))
                     Assert.Fail();
 
-                Assert.AreEqual(new Vector2(-8, -8), mapGrid.WorldPosition);
-                Assert.AreEqual(new Tile(2, 511), mapGrid.GetTileRef(new MapIndices(0, 0)).Tile);
+                Assert.That(mapGrid.WorldPosition, Is.EqualTo(new Vector2(-8, -8)));
+                Assert.That(mapGrid.GetTileRef(new MapIndices(0, 0)).Tile, Is.EqualTo(new Tile(2, 511)));
             }
 
         }
diff --git a/Content.Tests/Server/Preferences/PreferencesDatabaseTests.cs b/Content.Tests/Server/Preferences/PreferencesDatabaseTests.cs
index 1aa4353c10..42482a7e19 100644
--- a/Content.Tests/Server/Preferences/PreferencesDatabaseTests.cs
+++ b/Content.Tests/Server/Preferences/PreferencesDatabaseTests.cs
@@ -100,11 +100,11 @@ namespace Content.Tests.Server.Preferences
             await db.SaveSelectedCharacterIndexAsync(username, slot);
             await db.SaveCharacterSlotAsync(username, CharlieCharlieson(), slot);
             var prefs = await db.GetPlayerPreferencesAsync(username);
-            Assert.AreEqual(prefs.SelectedCharacterIndex, 0);
+            Assert.That(prefs.SelectedCharacterIndex, Is.EqualTo(0));
 
             await db.SaveSelectedCharacterIndexAsync(username, MaxCharacterSlots);
             prefs = await db.GetPlayerPreferencesAsync(username);
-            Assert.AreEqual(prefs.SelectedCharacterIndex, MaxCharacterSlots - 1);
+            Assert.That(prefs.SelectedCharacterIndex, Is.EqualTo(MaxCharacterSlots - 1));
         }
     }
 }
diff --git a/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs b/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs
index d041cddefa..e06290fb54 100644
--- a/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs
+++ b/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs
@@ -14,7 +14,7 @@ namespace Content.Tests.Shared.Chemistry
         public void ReagentUnitIntegerTests(int value, string expected)
         {
             var result = ReagentUnit.New(value);
-            Assert.AreEqual(expected, $"{result}");
+            Assert.That($"{result}", Is.EqualTo(expected));
         }
 
         [Test]
@@ -23,7 +23,7 @@ namespace Content.Tests.Shared.Chemistry
         public void ReagentUnitFloatTests(float value, string expected)
         {
             var result = ReagentUnit.New(value);
-            Assert.AreEqual(expected, $"{result}");
+            Assert.That($"{result}", Is.EqualTo(expected));
         }
 
         [Test]
@@ -32,7 +32,7 @@ namespace Content.Tests.Shared.Chemistry
         public void ReagentUnitDoubleTests(double value, string expected)
         {
             var result = ReagentUnit.New(value);
-            Assert.AreEqual(expected, $"{result}");
+            Assert.That($"{result}", Is.EqualTo(expected));
         }
 
         [Test]
@@ -41,7 +41,7 @@ namespace Content.Tests.Shared.Chemistry
         public void ReagentUnitStringTests(string value, string expected)
         {
             var result = ReagentUnit.New(value);
-            Assert.AreEqual(expected, $"{result}");
+            Assert.That($"{result}", Is.EqualTo(expected));
         }
 
         [Test]
@@ -56,7 +56,7 @@ namespace Content.Tests.Shared.Chemistry
 
             var result = a + b;
 
-            Assert.AreEqual(expected, $"{result}");
+            Assert.That($"{result}", Is.EqualTo(expected));
         }
 
         [Test]
@@ -70,7 +70,7 @@ namespace Content.Tests.Shared.Chemistry
 
             var result = a - b;
 
-            Assert.AreEqual(expected, $"{result}");
+            Assert.That($"{result}", Is.EqualTo(expected));
         }
 
         [Test]
@@ -84,7 +84,7 @@ namespace Content.Tests.Shared.Chemistry
 
             var result = a / b;
 
-            Assert.AreEqual(expected, $"{result}");
+            Assert.That($"{result}", Is.EqualTo(expected));
         }
 
         [Test]
@@ -97,7 +97,7 @@ namespace Content.Tests.Shared.Chemistry
 
             var result = a * b;
 
-            Assert.AreEqual(expected, $"{result}");
+            Assert.That($"{result}", Is.EqualTo(expected));
         }
 
         [Test]
@@ -107,7 +107,7 @@ namespace Content.Tests.Shared.Chemistry
         public void FloatRoundingTest(float a, int expected)
         {
             var result = (int) MathF.Round(a * (float) MathF.Pow(10, 2), MidpointRounding.AwayFromZero);
-            Assert.AreEqual(expected, result);
+            Assert.That(result, Is.EqualTo(expected));
         }
 
         [Test]
@@ -122,7 +122,7 @@ namespace Content.Tests.Shared.Chemistry
                 ReagentUnit.New(4),
             };
             var min = ReagentUnit.Min(unorderedList);
-            Assert.AreEqual(ReagentUnit.New(1), min);
+            Assert.That(min, Is.EqualTo(ReagentUnit.New(1)));
         }
 
         [Test]
@@ -136,8 +136,8 @@ namespace Content.Tests.Shared.Chemistry
         {
             var parameter = ReagentUnit.New(a);
             var comparison = ReagentUnit.New(b);
-            Assert.AreEqual(comparison.Equals(parameter), parameter.Equals(comparison));
-            Assert.AreEqual(expected, comparison.Equals(parameter));
+            Assert.That(parameter.Equals(comparison), Is.EqualTo(comparison.Equals(parameter)));
+            Assert.That(comparison.Equals(parameter), Is.EqualTo(expected));
         }
     }
 }