diff --git a/flang/test/Driver/input-from-stdin-llvm.ll b/flang/test/Driver/input-from-stdin/input-from-stdin-llvm.ll
similarity index 100%
rename from flang/test/Driver/input-from-stdin-llvm.ll
rename to flang/test/Driver/input-from-stdin/input-from-stdin-llvm.ll
diff --git a/flang/test/Driver/input-from-stdin.f90 b/flang/test/Driver/input-from-stdin/input-from-stdin.f90
similarity index 100%
rename from flang/test/Driver/input-from-stdin.f90
rename to flang/test/Driver/input-from-stdin/input-from-stdin.f90
diff --git a/flang/test/Driver/input-from-stdin/lit.local.cfg b/flang/test/Driver/input-from-stdin/lit.local.cfg
new file mode 100644
index 0000000000000..11dc6642bf6e7
--- /dev/null
+++ b/flang/test/Driver/input-from-stdin/lit.local.cfg
@@ -0,0 +1,3 @@
+# In some modes flang will exit before cat does. If pipefail is enabled this means
+# we get cat's exit code not flang's.
+config.pipefail = False