diff --git a/tests/catar.rs b/tests/catar.rs
index a55ff5c39..6b274ce0b 100644
--- a/tests/catar.rs
+++ b/tests/catar.rs
@@ -48,6 +48,8 @@ fn run_all_tests() -> Result<(), Error> {
 
     run_test("tests/catar_data/test_goodbye_sort_order")?;
 
+    run_test("tests/catar_data/test_files_and_subdirs")?;
+
     Ok(())
 }
 
diff --git a/tests/catar_data/test_files_and_subdirs/a-test-symlink b/tests/catar_data/test_files_and_subdirs/a-test-symlink
new file mode 120000
index 000000000..30d67d467
--- /dev/null
+++ b/tests/catar_data/test_files_and_subdirs/a-test-symlink
@@ -0,0 +1 @@
+file2
\ No newline at end of file
diff --git a/tests/catar_data/test_files_and_subdirs/file1 b/tests/catar_data/test_files_and_subdirs/file1
new file mode 100644
index 000000000..5da849b5c
--- /dev/null
+++ b/tests/catar_data/test_files_and_subdirs/file1
@@ -0,0 +1 @@
+ABC
diff --git a/tests/catar_data/test_files_and_subdirs/file2 b/tests/catar_data/test_files_and_subdirs/file2
new file mode 100644
index 000000000..ff8d790f0
--- /dev/null
+++ b/tests/catar_data/test_files_and_subdirs/file2
@@ -0,0 +1 @@
+CDEFG
diff --git a/tests/catar_data/test_files_and_subdirs/subdir1/subfile1 b/tests/catar_data/test_files_and_subdirs/subdir1/subfile1
new file mode 100644
index 000000000..aff399b34
--- /dev/null
+++ b/tests/catar_data/test_files_and_subdirs/subdir1/subfile1
@@ -0,0 +1 @@
+test subdir1 content
diff --git a/tests/catar_data/test_files_and_subdirs/subdir1/subfile2 b/tests/catar_data/test_files_and_subdirs/subdir1/subfile2
new file mode 100644
index 000000000..884d08c65
--- /dev/null
+++ b/tests/catar_data/test_files_and_subdirs/subdir1/subfile2
@@ -0,0 +1 @@
+another test subdir1 content