diff --git a/bin/tests/system/.gitignore b/bin/tests/system/.gitignore
index 0488948e4a..e27cf5efaa 100644
--- a/bin/tests/system/.gitignore
+++ b/bin/tests/system/.gitignore
@@ -20,4 +20,10 @@ named.run
 /start.sh
 /stop.sh
 /ifconfig.sh
-/*_tmp_*
+
+# Ignore file names with underscore in their name except python or shell files.
+# This is done to ignore the temporary directories and symlinks created by the
+# pytest runner, which contain underscore in their file names.
+/*_*
+!/*_*.py
+!/*_*.sh