diff --git a/src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java b/src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java
index 989c5406cd7..4fc0556a77c 100644
--- a/src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java
+++ b/src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java
@@ -24,6 +24,7 @@ import org.elasticsearch.common.cli.CliTool;
 import org.elasticsearch.common.cli.CliToolConfig;
 import org.elasticsearch.common.cli.Terminal;
 import org.elasticsearch.common.cli.commons.CommandLine;
+import org.elasticsearch.common.io.PathUtils;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -39,7 +40,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Locale;
 
 import static org.elasticsearch.common.cli.CliToolConfig.Builder.cmd;
@@ -83,7 +83,7 @@ public class StandaloneRunner extends CliTool {
             this.size = size;
             this.url = url;
             this.base64text = base64text;
-            DocumentMapperParser mapperParser = MapperTestUtils.newMapperParser(Paths.get(".")); // use CWD b/c it won't be used
+            DocumentMapperParser mapperParser = MapperTestUtils.newMapperParser(PathUtils.get(".")); // use CWD b/c it won't be used
             mapperParser.putTypeParser(AttachmentMapper.CONTENT_TYPE, new AttachmentMapper.TypeParser());
 
             String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/standalone/standalone-mapping.json");
@@ -99,7 +99,7 @@ public class StandaloneRunner extends CliTool {
                 builder.field("_content", base64text);
             } else {
                 // A file is provided
-                byte[] bytes = copyToBytes(Paths.get(url));
+                byte[] bytes = copyToBytes(PathUtils.get(url));
                 builder.field("_content", bytes);
             }
 
diff --git a/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MultifieldAttachmentMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MultifieldAttachmentMapperTests.java
index 2cb7b321da4..07b9d04d8e3 100644
--- a/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MultifieldAttachmentMapperTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MultifieldAttachmentMapperTests.java
@@ -19,6 +19,8 @@
 
 package org.elasticsearch.index.mapper.attachment.test.unit;
 
+import java.nio.charset.StandardCharsets;
+
 import org.elasticsearch.common.Base64;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.mapper.DocumentMapper;
@@ -91,7 +93,7 @@ public class MultifieldAttachmentMapperTests extends AttachmentUnitTestCase {
         String contentType = "text/plain; charset=ISO-8859-1";
         String forcedName = "dummyname.txt";
 
-        String bytes = Base64.encodeBytes(originalText.getBytes());
+        String bytes = Base64.encodeBytes(originalText.getBytes(StandardCharsets.ISO_8859_1));
         threadPool = new ThreadPool("testing-only");
 
         MapperService mapperService = MapperTestUtils.newMapperService(createTempDir(), threadPool);