diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/TrackedEntityRequestParamsMapperTest.java b/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/TrackedEntityRequestParamsMapperTest.java
index 6076fb6cca9b..d7d088f3aed7 100644
--- a/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/TrackedEntityRequestParamsMapperTest.java
+++ b/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/TrackedEntityRequestParamsMapperTest.java
@@ -52,7 +52,6 @@ class TrackedEntityRequestParamsMapperTest {
   private TrackedEntityQueryRequestMapper trackedEntityQueryRequestMapper;
 
   @BeforeEach
-  @SuppressWarnings("unchecked")
   public void setUp() {
     trackedEntityQueryRequestMapper =
         new TrackedEntityQueryRequestMapper(trackedEntityTypeService, programService);
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/DataElementConditionTest.java b/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/DataElementConditionTest.java
index 3c3473cc1a41..23d66775b561 100644
--- a/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/DataElementConditionTest.java
+++ b/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/DataElementConditionTest.java
@@ -47,6 +47,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("unchecked")
 class DataElementConditionTest {
 
   private DimensionIdentifier<DimensionParam> dimensionIdentifier;
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/DataElementQueryBuilderTest.java b/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/DataElementQueryBuilderTest.java
index d51162c436e2..ce11a678ab10 100644
--- a/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/DataElementQueryBuilderTest.java
+++ b/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/DataElementQueryBuilderTest.java
@@ -43,6 +43,7 @@
 import org.hisp.dhis.legend.LegendSet;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("unchecked")
 class DataElementQueryBuilderTest {
 
   private final DataElementQueryBuilder dataElementQueryBuilder = new DataElementQueryBuilder();
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/SqlQueryHelperTest.java b/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/SqlQueryHelperTest.java
index 264fad506280..3bd06e1d8ae6 100644
--- a/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/SqlQueryHelperTest.java
+++ b/dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/SqlQueryHelperTest.java
@@ -44,6 +44,7 @@
 import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link SqlQueryHelper}. */
+@SuppressWarnings("unchecked")
 class SqlQueryHelperTest {
 
   @Test