diff --git a/tests/Aetheria.Shared.Tests/ProductLinesCatalogTests.cs b/tests/Aetheria.Shared.Tests/ProductLinesCatalogTests.cs
index 408d06826..307c5c915 100644
--- a/tests/Aetheria.Shared.Tests/ProductLinesCatalogTests.cs
+++ b/tests/Aetheria.Shared.Tests/ProductLinesCatalogTests.cs
@@ -58,7 +58,7 @@ public sealed class ProductLinesCatalogTests
     {
         using var cache = RestoredHullsTests.OpenCatalog();
         var products = cache.GetAll<FactionProductData>().ToArray();
-        var gear = cache.GetAll<GearData>().Where(d => d is not WeaponItemData && d.Roles.Count > 0).ToArray();
+        var gear = cache.GetAll<GearData>().Where(d => d is not WeaponItemData && (d.Roles?.Count ?? 0) > 0).ToArray();
         Assert.All(OneMakerGear, name => Assert.Contains(gear, d => d.Name == name));
         var sold = 0;
         foreach (var design in gear.Where(d => !OneMakerGear.Contains(d.Name)))
diff --git a/tests/Aetheria.Shared.Tests/ProductLinesCommandTests.cs b/tests/Aetheria.Shared.Tests/ProductLinesCommandTests.cs
index 648813261..a036138f2 100644
--- a/tests/Aetheria.Shared.Tests/ProductLinesCommandTests.cs
+++ b/tests/Aetheria.Shared.Tests/ProductLinesCommandTests.cs
@@ -283,6 +283,7 @@ public sealed class GearLineCommandTests : ProductLinesCommandTests
         using (var cache = Open())
         {
             var radiator = cache.GetAll<GearData>().Single(g => g.Name == "Radiator");
+            radiator.Behaviors.Clear(); // the store refuses a behavior that names a role the design lacks
             radiator.Roles.Clear();
             cache.Upsert(radiator);
             cache.FlushAsync().Wait();