diff --git a/teamcity/flake8_v2_plugin.py b/teamcity/flake8_v2_plugin.py
index e60937f..89d831f 100644
--- a/teamcity/flake8_v2_plugin.py
+++ b/teamcity/flake8_v2_plugin.py
@@ -54,7 +54,7 @@ def get_file_results(self):
             }
 
             error_message = '%s %s' % (code, text)
-            test_name = 'pep8: %s: %s' % (position, error_message)
+            test_name = 'pep8: %s: %s' % (normalized_filename, error_message)
 
             messages.testStarted(test_name)
 
@@ -64,6 +64,7 @@ def get_file_results(self):
                 line = self.lines[line_number - 1]
 
             details = [
+                position,
                 line.rstrip(),
                 re.sub(r'\S', ' ', line[:offset]) + '^',
             ]