diff --git a/tests/while.err b/tests/while.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/while.in b/tests/while.in
new file mode 100644
index 000000000..95cb2584c
--- /dev/null
+++ b/tests/while.in
@@ -0,0 +1,27 @@
+# vim: set ft=fish:
+
+function never_runs
+	while false
+	end
+end
+
+function early_return
+	while true
+		return 2
+	end
+end
+
+function runs_once
+	set -l i 1
+	while test $i -ne 0 && set i (math $i - 1)
+	end
+end
+
+# this should return 1
+never_runs; echo $status
+
+# this should return 0
+runs_once; echo $status
+
+# this should return 2
+early_return; echo $status
diff --git a/tests/while.out b/tests/while.out
new file mode 100644
index 000000000..56f24a18d
--- /dev/null
+++ b/tests/while.out
@@ -0,0 +1,3 @@
+1
+0
+2