diff --git a/roles/tox/library/tox_parse_output.py b/roles/tox/library/tox_parse_output.py
index cbae7e0a9..b2532ac90 100644
--- a/roles/tox/library/tox_parse_output.py
+++ b/roles/tox/library/tox_parse_output.py
@@ -117,6 +117,11 @@ def extract_file_comments(tox_output, workdir, tox_envlist=None):
         if file_path.startswith('/'):
             continue
 
+        # We should only handle files that are in under version control.
+        # For now, skip .tox directory, we can enhance later.
+        if file_path.startswith('.tox'):
+            continue
+
         ret.setdefault(file_path, [])
         if tox_envlist:
             message = "{envlist}: {message}".format(