diff --git a/Content.IntegrationTests/ContentIntegrationTest.cs b/Content.IntegrationTests/ContentIntegrationTest.cs
index 6a68675763..35a4efac86 100644
--- a/Content.IntegrationTests/ContentIntegrationTest.cs
+++ b/Content.IntegrationTests/ContentIntegrationTest.cs
@@ -11,7 +11,10 @@ namespace Content.IntegrationTests
     {
         protected override ClientIntegrationInstance StartClient(ClientIntegrationOptions options = null)
         {
-            options = options ?? new ClientIntegrationOptions();
+            options ??= new ClientIntegrationOptions();
+            // ReSharper disable once RedundantNameQualifier
+            options.ClientContentAssembly = typeof(Client.EntryPoint).Assembly;
+            options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly;
             options.BeforeStart += () =>
             {
                 // Connecting to Discord is a massive waste of time.
@@ -27,5 +30,13 @@ namespace Content.IntegrationTests
             };
             return base.StartClient(options);
         }
+
+        protected override ServerIntegrationInstance StartServer(ServerIntegrationOptions options = null)
+        {
+            options ??= new ServerIntegrationOptions();
+            options.ServerContentAssembly = typeof(Server.EntryPoint).Assembly;
+            options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly;
+            return base.StartServer(options);
+        }
     }
 }
diff --git a/RobustToolbox b/RobustToolbox
index 8291294aa1..d3b8a07350 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 8291294aa163742025ee7379982ef1ec184c3c75
+Subproject commit d3b8a073505b86c7da928a05753ad571dd6f3c15