diff --git a/src/Examples/DatabasePerTenantExample/Controllers/EmployeesController.cs b/src/Examples/DatabasePerTenantExample/Controllers/EmployeesController.cs
index 5e17afab9b..f9d5595123 100644
--- a/src/Examples/DatabasePerTenantExample/Controllers/EmployeesController.cs
+++ b/src/Examples/DatabasePerTenantExample/Controllers/EmployeesController.cs
@@ -3,11 +3,6 @@
 
 namespace DatabasePerTenantExample.Controllers;
 
-// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
-public partial class EmployeesController
-{
-}
-
 [DisableRoutingConvention]
 [Route("api/{tenantName}/employees")]
 partial class EmployeesController
diff --git a/test/DiscoveryTests/PrivateResource.cs b/test/DiscoveryTests/PrivateResource.cs
index ed6dc23204..facbfb6c35 100644
--- a/test/DiscoveryTests/PrivateResource.cs
+++ b/test/DiscoveryTests/PrivateResource.cs
@@ -1,9 +1,11 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
 
 namespace DiscoveryTests;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
 public sealed class PrivateResource : Identifiable<int>
 {
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs
index 2170d113ce..5d8793b453 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs
@@ -4,11 +4,6 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults;
 
-// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
-public partial class ToothbrushesController
-{
-}
-
 partial class ToothbrushesController
 {
     internal const int EmptyActionResultId = 11111111;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs
index 313a8e8849..5d4da838c9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs
@@ -3,11 +3,6 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
 
-// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
-public partial class CiviliansController
-{
-}
-
 [ApiController]
 [DisableRoutingConvention]
 [Route("world-civilians")]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs
index e3fab1ff3c..f99f3aa225 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs
@@ -8,11 +8,6 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
 
-// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
-public partial class TownsController
-{
-}
-
 [DisableRoutingConvention]
 [Route("world-api/civilization/popular/towns")]
 partial class TownsController
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs
index fea280724b..66e8dacb2c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs
@@ -5,6 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.EagerLoading")]
 public sealed class City : Identifiable<int>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs
index bf7b915f03..dc4c27ca54 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs
@@ -3,11 +3,6 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
 
-// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
-public partial class PaintingsController
-{
-}
-
 [DisableRoutingConvention]
 [Route("custom/path/to/paintings-of-the-world")]
 partial class PaintingsController
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs
index 911054f291..663b2a3bd6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs
@@ -1,9 +1,11 @@
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources.Annotations;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
 public sealed class BankAccount : ObfuscatedIdentifiable
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs
index 323d1bd1e3..99f0154147 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs
@@ -1,9 +1,11 @@
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources.Annotations;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
 public sealed class DebitCard : ObfuscatedIdentifiable
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs
index c11db3422e..bdc7068a3d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs
@@ -3,11 +3,6 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
 
-// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
-public partial class WebProductsController
-{
-}
-
 [DisableRoutingConvention]
 [Route("{countryCode}/products")]
 partial class WebProductsController
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs
index b300e0095d..ee31954740 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs
@@ -3,11 +3,6 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
 
-// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
-public partial class WebShopsController
-{
-}
-
 [DisableRoutingConvention]
 [Route("{countryCode}/shops")]
 partial class WebShopsController
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs
index 4cb4581291..b1df54874f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs
@@ -1,11 +1,13 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
 public sealed class DivingBoard : Identifiable<int>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs
index 2b715edc7d..ce786ff839 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs
@@ -1,10 +1,12 @@
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
 public sealed class SwimmingPool : Identifiable<int>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs
index 95bda04456..9dbd17662e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs
@@ -1,10 +1,12 @@
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
 public sealed class WaterSlide : Identifiable<int>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs
index 20c95ea769..5b00f1bb0c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs
@@ -5,6 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
 public sealed class AccountPreferences : Identifiable<int>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
index 2f90ed2615..2805745644 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
@@ -5,6 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
 public sealed class Appointment : Identifiable<int>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs
index acd1fa446c..07804aeac6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs
@@ -5,6 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
 public sealed class Label : Identifiable<int>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs
index 73557d7fcf..007182781a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs
@@ -5,6 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
 public sealed class LoginAttempt : Identifiable<int>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsController.cs
index f50cae1908..e260788905 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsController.cs
@@ -2,11 +2,6 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
 
-// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
-public partial class PillowsController
-{
-}
-
 [DisableQueryString("skipCache")]
 partial class PillowsController
 {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs
index 2860b6d344..8b09419c2b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs
@@ -5,6 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers")]
 public sealed class Room : Identifiable<int>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasController.cs
index 8ec503ce22..d6d2d66fa8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasController.cs
@@ -3,11 +3,6 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
 
-// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
-public partial class SofasController
-{
-}
-
 [DisableQueryString(JsonApiQueryStringParameters.Sort | JsonApiQueryStringParameters.Page)]
 partial class SofasController
 {