2 files changed, 7 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
index 920e33043f..aba86119ab 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.fail;
 
 import com.google.common.io.BaseEncoding;
 import com.google.devtools.build.lib.testutil.TestUtils;
+import com.google.devtools.build.lib.unix.NativePosixFiles;
 import com.google.devtools.build.lib.util.Fingerprint;
 import com.google.devtools.build.lib.util.Preconditions;
 
@@ -102,15 +103,15 @@ public abstract class FileSystemTest {
   protected abstract FileSystem getFreshFileSystem() throws IOException;
 
   protected boolean isSymbolicLink(File file) {
-    return com.google.devtools.build.lib.unix.FilesystemUtils.isSymbolicLink(file);
+    return NativePosixFiles.isSymbolicLink(file);
   }
 
   protected void setWritable(File file) throws IOException {
-    com.google.devtools.build.lib.unix.FilesystemUtils.setWritable(file);
+    NativePosixFiles.setWritable(file);
   }
 
   protected void setExecutable(File file) throws IOException {
-    com.google.devtools.build.lib.unix.FilesystemUtils.setExecutable(file);
+    NativePosixFiles.setExecutable(file);
   }
 
   private static final Pattern STAT_SUBDIR_ERROR = Pattern.compile("(.*) \\(Not a directory\\)");
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/UnixFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/UnixFileSystemTest.java
index 40ace2b6f6..46b200baff 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/UnixFileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/UnixFileSystemTest.java
@@ -18,7 +18,8 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.devtools.build.lib.unix.FilesystemUtils;
+import com.google.devtools.build.lib.unix.NativePosixFiles;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -68,7 +69,7 @@ public class UnixFileSystemTest extends SymlinkAwareFileSystemTest {
     Path regular = absolutize("regular");
     Path fifo = absolutize("fifo");
     FileSystemUtils.createEmptyFile(regular);
-    FilesystemUtils.mkfifo(fifo.toString(), 0777);
+    NativePosixFiles.mkfifo(fifo.toString(), 0777);
     assertTrue(regular.isFile());
     assertFalse(regular.isSpecialFile());
     assertTrue(regular.stat().isFile());