Index: test/ELF/file-access.s
===================================================================
--- test/ELF/file-access.s
+++ test/ELF/file-access.s
@@ -1,15 +1,15 @@
-# REQUIRES: x86, gnustat
+# REQUIRES: x86, linux, shell
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld -r %t.o -o %t1.o
-# RUN: stat -c %%A %t1.o | FileCheck --check-prefix=CHECK-RELOC %s
-# CHECK-RELOC: -rw-r--r--
+# RUN: [ ! -x %t1.o ] && echo "n" | FileCheck --check-prefix=CHECK-RELOC %s
+# CHECK-RELOC: n
 # RUN: ld.lld -shared %t.o -o %t2.so
-# RUN: stat -c %%A %t2.so | FileCheck --check-prefix=CHECK-SHARED %s
-# CHECK-SHARED: -rwxr-xr-x
+# RUN: [ -x %t2.so ] && echo "y" | FileCheck --check-prefix=CHECK-SHARED %s
+# CHECK-SHARED: y
 # RUN: ld.lld %t.o -o %t3
-# RUN: stat -c %%A %t3 | FileCheck --check-prefix=CHECK-EXEC %s
-# CHECK-EXEC: -rwxr-xr-x
+# RUN: [ -x %t3 ] && echo "y" | FileCheck --check-prefix=CHECK-EXEC %s
+# CHECK-EXEC: y
 
 .global _start
 _start:
Index: test/lit.cfg.py
===================================================================
--- test/lit.cfg.py
+++ test/lit.cfg.py
@@ -91,11 +91,3 @@
     if 'GNU tar' in tar_version.stdout.read().decode():
         config.available_features.add('gnutar')
     tar_version.wait()
-
-stat_executable = lit.util.which('stat', config.environment['PATH'])
-if stat_executable:
-    stat_version = subprocess.Popen(
-        [stat_executable, '--version'], stdout=subprocess.PIPE, env={'LANG': 'C'})
-    if 'GNU coreutils' in stat_version.stdout.read().decode():
-        config.available_features.add('gnustat')
-    stat_version.wait()