diff --git a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/dao/OrganizationAffiliationDaoTest.java b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/dao/OrganizationAffiliationDaoTest.java
index 9a0b5e82a..7e1e817c7 100644
--- a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/dao/OrganizationAffiliationDaoTest.java
+++ b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/dao/OrganizationAffiliationDaoTest.java
@@ -324,12 +324,12 @@ public void testExistsNotDeletedByParentOrganizationMemberOrganizationRoleAndNot
 		}
 	}
 
-	private class TaskAsCsvGeneratorReader extends Reader
+	private static class TaskAsCsvGeneratorReader extends Reader
 	{
 		public static final int TASK_ROW_LINE_LENGTH = 1615;
 
+		private final int maxTasks;
 		private int currentTask;
-		private int maxTasks;
 
 		public TaskAsCsvGeneratorReader(int maxTasks)
 		{
diff --git a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/dao/OrganizationDaoTest.java b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/dao/OrganizationDaoTest.java
index 608088ec1..01c2b37f8 100755
--- a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/dao/OrganizationDaoTest.java
+++ b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/dao/OrganizationDaoTest.java
@@ -257,12 +257,12 @@ public void testUpdateWithExistingBinary() throws Exception
 		dao.update(createdOrg);
 	}
 
-	private class TaskAsCsvGeneratorReader extends Reader
+	private static class TaskAsCsvGeneratorReader extends Reader
 	{
 		public static final int TASK_ROW_LINE_LENGTH = 1615;
 
+		private final int maxTasks;
 		private int currentTask;
-		private int maxTasks;
 
 		public TaskAsCsvGeneratorReader(int maxTasks)
 		{