diff --git a/bin/tests/system/.gitignore b/bin/tests/system/.gitignore
index d515e8ec36..cdf333c5bf 100644
--- a/bin/tests/system/.gitignore
+++ b/bin/tests/system/.gitignore
@@ -23,4 +23,10 @@ parallel.mk
 /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