diff --git a/run_full_tests.py b/run_full_tests.py
index 69c14c0..fa12f9b 100755
--- a/run_full_tests.py
+++ b/run_full_tests.py
@@ -36,6 +36,7 @@ def test1():
             f.write(in_data)
 
         subprocess.check_call(["scuba", "/bin/sh", "-c", "cat file.in >> file.out"])
+        subprocess.check_call(["scuba", "/bin/sh", "-c", "yes '' | echo 'test'"])
 
         with open("file.out", "rt") as f:
             out_data = f.read()
diff --git a/scubainit/Makefile b/scubainit/Makefile
index 34bd059..e2e48d7 100644
--- a/scubainit/Makefile
+++ b/scubainit/Makefile
@@ -23,6 +23,7 @@ TARGET=x86_64-unknown-linux-musl
 
 # Enable static linking
 STATIC_RUSTFLAGS=-C relocation-model=static
+NIGHTLY_RUSTFLAGS=-Zon-broken-pipe=inherit
 
 export RUSTFLAGS
 
@@ -43,7 +44,7 @@ fmt:
 
 .PHONY: scubainit-debug  # always build
 scubainit-debug: PROFILE=debug
-scubainit-debug: RUSTFLAGS=$(STATIC_RUSTFLAGS)
+scubainit-debug: RUSTFLAGS=$(STATIC_RUSTFLAGS) $(NIGHTLY_RUSTFLAGS)
 scubainit-debug: setup
 	@/bin/echo -e "\nBuilding scubainit ($(PROFILE)) with RUSTFLAGS=\"$$RUSTFLAGS\""
 	cargo build --target $(TARGET)
@@ -51,7 +52,7 @@ scubainit-debug: setup
 
 .PHONY: scubainit  # always build
 scubainit: PROFILE=release
-scubainit: RUSTFLAGS=$(STATIC_RUSTFLAGS)
+scubainit: RUSTFLAGS=$(STATIC_RUSTFLAGS) $(NIGHTLY_RUSTFLAGS)
 scubainit: setup
 	@/bin/echo -e "\nBuilding scubainit ($(PROFILE)) with RUSTFLAGS=\"$$RUSTFLAGS\""
 	cargo build --target $(TARGET) --release
diff --git a/scubainit/rust-toolchain.toml b/scubainit/rust-toolchain.toml
new file mode 100644
index 0000000..e386c08
--- /dev/null
+++ b/scubainit/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2024-05-07"
+targets = ["x86_64-unknown-linux-musl"]