diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/MonthEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/MonthEditorViewModel.java
index 01fc59e3719..b3cff06364b 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/MonthEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/MonthEditorViewModel.java
@@ -15,7 +15,7 @@
 import org.jabref.model.strings.StringUtil;
 
 public class MonthEditorViewModel extends OptionEditorViewModel<Month> {
-    private BibDatabaseMode databaseMode;
+    private final BibDatabaseMode databaseMode;
 
     public MonthEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, BibDatabaseMode databaseMode, FieldCheckers fieldCheckers, UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
diff --git a/src/test/java/org/jabref/gui/fieldeditors/optioneditors/LanguageEditorViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/optioneditors/LanguageEditorViewModelTest.java
index 50b7d1a811d..2c60f7774af 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/optioneditors/LanguageEditorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/optioneditors/LanguageEditorViewModelTest.java
@@ -3,9 +3,6 @@
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
 
@@ -20,11 +17,9 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
 public class LanguageEditorViewModelTest {