diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingRepositoryTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingRepositoryTest.java
index b8138457436..25033372740 100644
--- a/src/test/java/org/jabref/gui/keyboard/KeyBindingRepositoryTest.java
+++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingRepositoryTest.java
@@ -31,7 +31,7 @@ void parseStringLists(List<KeyBinding> keybindings, List<String> bindings) {
         List<String> bindNames = keybindings.stream().map(KeyBinding::getConstant).toList();
         KeyBindingRepository keyBindingRepository = new KeyBindingRepository(bindNames, bindings);
 
-        assertEquals(keyBindingRepository.get(bindNames.get(0)), bindings.get(0));
+        assertEquals(keyBindingRepository.get(bindNames.getFirst()), bindings.getFirst());
         assertEquals(keyBindingRepository.get(bindNames.get(1)), bindings.get(1));
     }
 }
diff --git a/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
index c7486523749..128179e6718 100644
--- a/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
+++ b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
@@ -27,35 +27,35 @@ public static void setup() {
     public void mainTableColumnModelParserRetrievesCorrectType() {
         MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testQualifier);
 
-        assertEquals(testColumnModel.getType(), testType);
+        assertEquals(testType, testColumnModel.getType());
     }
 
     @Test
     public void mainTableColumnModelParserRetrievesCorrectQualifier() {
         MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testQualifier);
 
-        assertEquals(testColumnModel.getQualifier(), testQualifier);
+        assertEquals(testQualifier, testColumnModel.getQualifier());
     }
 
     @Test
     public void fullMainTableColumnModelParserRetrievesCorrectType() {
         MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testName);
 
-        assertEquals(testColumnModel.getType(), testType);
+        assertEquals(testType, testColumnModel.getType());
     }
 
     @Test
     public void fullMainTableColumnModelParserRetrievesCorrectQualifier() {
         MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testName);
 
-        assertEquals(testColumnModel.getQualifier(), testQualifier);
+        assertEquals(testQualifier, testColumnModel.getQualifier());
     }
 
     @Test
     public void typeOnlyMainTableColumnModelParserRetrievesCorrectType() {
         MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testTypeOnlyName);
 
-        assertEquals(testColumnModel.getType(), testTypeOnlyType);
+        assertEquals(testTypeOnlyType, testColumnModel.getType());
     }
 
     @Test