diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
index e4bfc416c9..e4bcb1f8ac 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
@@ -82,7 +82,7 @@ public void testSimpleWord() throws Exception {
 
         Reader reader = new InputStreamReader((InputStream) response.getEntity(), UTF_8);
 
-        CSVParser csvReader = new CSVParser(reader, CSVFormat.EXCEL);
+        CSVParser csvReader = CSVParser.builder().setReader(reader).setFormat(CSVFormat.EXCEL).get();
 
         Map<String, String> metadata = new HashMap<>();
 
@@ -129,15 +129,13 @@ public void testPasswordProtected() throws Exception {
         assertEquals(200, response.getStatus());
 
         // Check results
-        Reader reader = new InputStreamReader((InputStream) response.getEntity(), UTF_8);
-        CSVParser csvReader = new CSVParser(reader, CSVFormat.EXCEL);
-
         Map<String, String> metadata = new HashMap<>();
-
-        for (CSVRecord r : csvReader) {
-            metadata.put(r.get(0), r.get(1));
+        try (Reader reader = new InputStreamReader((InputStream) response.getEntity(), UTF_8);
+                CSVParser csvReader = CSVParser.builder().setReader(reader).setFormat(CSVFormat.EXCEL).get()) {
+            for (CSVRecord r : csvReader) {
+                metadata.put(r.get(0), r.get(1));
+            }
         }
-        csvReader.close();
 
         assertNotNull(metadata.get(TikaCoreProperties.CREATOR.getName()));
         assertEquals("pavel", metadata.get(TikaCoreProperties.CREATOR.getName()));