diff --git a/src/main/java/org/apache/commons/csv/CSVPrinter.java b/src/main/java/org/apache/commons/csv/CSVPrinter.java
index 89a90e3a..9db13c3d 100644
--- a/src/main/java/org/apache/commons/csv/CSVPrinter.java
+++ b/src/main/java/org/apache/commons/csv/CSVPrinter.java
@@ -312,7 +312,7 @@ public final class CSVPrinter implements Flushable, Closeable {
         values.forEachOrdered(t -> {
             try {
                 print(t);
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 throw rethrow(e);
             }
         });
@@ -501,7 +501,7 @@ public final class CSVPrinter implements Flushable, Closeable {
         values.forEachOrdered(t -> {
             try {
                 printRecordObject(t);
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 throw rethrow(e);
             }
         });
diff --git a/src/test/java/org/apache/commons/csv/CSVFormatTest.java b/src/test/java/org/apache/commons/csv/CSVFormatTest.java
index 4d4591d0..0be97745 100644
--- a/src/test/java/org/apache/commons/csv/CSVFormatTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVFormatTest.java
@@ -1567,6 +1567,6 @@ public class CSVFormatTest {
     @Test
     public void testWithSystemRecordSeparator() {
         final CSVFormat formatWithRecordSeparator = CSVFormat.DEFAULT.withSystemRecordSeparator();
-        assertEquals(System.getProperty("line.separator"), formatWithRecordSeparator.getRecordSeparator());
+        assertEquals(System.lineSeparator(), formatWithRecordSeparator.getRecordSeparator());
     }
 }
diff --git a/src/test/java/org/apache/commons/csv/CSVRecordTest.java b/src/test/java/org/apache/commons/csv/CSVRecordTest.java
index 9cb7f31e..4833c26c 100644
--- a/src/test/java/org/apache/commons/csv/CSVRecordTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVRecordTest.java
@@ -274,7 +274,7 @@ public class CSVRecordTest {
 
     @Test
     public void testToListAdd() {
-        String[] expected = values.clone();
+        final String[] expected = values.clone();
         final List<String> list = record.toList();
         list.add("Last");
         assertEquals("Last", list.get(list.size() - 1));
@@ -293,7 +293,7 @@ public class CSVRecordTest {
 
     @Test
     public void testToListForEach() {
-        AtomicInteger i = new AtomicInteger();
+        final AtomicInteger i = new AtomicInteger();
         record.toList().forEach(e -> {
             assertEquals(values[i.getAndIncrement()], e);
         });
@@ -301,7 +301,7 @@ public class CSVRecordTest {
 
     @Test
     public void testToListSet() {
-        String[] expected = values.clone();
+        final String[] expected = values.clone();
         final List<String> list = record.toList();
         list.set(list.size() - 1, "Last");
         assertEquals("Last", list.get(list.size() - 1));