diff --git a/tests/__fish_complete_directories.err b/tests/__fish_complete_directories.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/__fish_complete_directories.in b/tests/__fish_complete_directories.in
deleted file mode 100644
index c6769a383..000000000
--- a/tests/__fish_complete_directories.in
+++ /dev/null
@@ -1,19 +0,0 @@
-cd ..
-mkdir -p test/data/abc
-mkdir -p test/data/abcd
-touch test/data/af
-touch test/data/abcdf
-mkdir -p test/data/xy
-mkdir -p test/data/xyz
-touch test/data/xyf
-touch test/data/xyzf
-echo \# __fish_complete_directories test/z
-__fish_complete_directories test/z
-echo \# __fish_complete_directories test/d
-__fish_complete_directories test/d
-echo \# __fish_complete_directories test/data
-__fish_complete_directories test/data
-echo \# __fish_complete_directories test/data/
-__fish_complete_directories test/data/
-echo \# __fish_complete_directories test/data/abc
-__fish_complete_directories test/data/abc 'abc dirs'
diff --git a/tests/__fish_complete_directories.out b/tests/__fish_complete_directories.out
deleted file mode 100644
index b668030c4..000000000
--- a/tests/__fish_complete_directories.out
+++ /dev/null
@@ -1,16 +0,0 @@
-# __fish_complete_directories test/z
-# __fish_complete_directories test/d
-test/data/	Directory
-test/buildroot/	Directory
-test/fish_expand_test/	Directory
-# __fish_complete_directories test/data
-test/data/	Directory
-# __fish_complete_directories test/data/
-test/data/abc/	Directory
-test/data/abcd/	Directory
-test/data/fish/	Directory
-test/data/xy/	Directory
-test/data/xyz/	Directory
-# __fish_complete_directories test/data/abc
-test/data/abc/	abc dirs
-test/data/abcd/	abc dirs
diff --git a/tests/checks/complete_directories.fish b/tests/checks/complete_directories.fish
new file mode 100644
index 000000000..3db3ee8b1
--- /dev/null
+++ b/tests/checks/complete_directories.fish
@@ -0,0 +1,27 @@
+#RUN: %fish %s
+cd ..
+mkdir -p test/data/abc
+mkdir -p test/data/abcd
+touch test/data/af
+touch test/data/abcdf
+mkdir -p test/data/xy
+mkdir -p test/data/xyz
+touch test/data/xyf
+touch test/data/xyzf
+__fish_complete_directories test/z
+# No match - no output!
+__fish_complete_directories test/d
+#CHECK: test/data/	Directory
+#CHECK: test/buildroot/	Directory
+#CHECK: test/fish_expand_test/	Directory
+__fish_complete_directories test/data
+#CHECK: test/data/	Directory
+__fish_complete_directories test/data/
+#CHECK: test/data/abc/	Directory
+#CHECK: test/data/abcd/	Directory
+#CHECK: test/data/fish/	Directory
+#CHECK: test/data/xy/	Directory
+#CHECK: test/data/xyz/	Directory
+__fish_complete_directories test/data/abc 'abc dirs'
+#CHECK: test/data/abc/	abc dirs
+#CHECK: test/data/abcd/	abc dirs