diff --git a/CHANGELOG b/CHANGELOG
index ae766aa0d..3299513d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,9 @@
   module. Thanks Mikhail Chernykh for the report and Bruno Oliveira for the
   PR.
 
+- fix #1204: another error when collecting with a nasty __getattr__().
+  Thanks Florian Bruhin for the PR.
+
 2.8.3
 -----
 
diff --git a/_pytest/python.py b/_pytest/python.py
index c3a951772..67d5e5c52 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -384,12 +384,13 @@ class PyobjMixin(PyobjContext):
     def reportinfo(self):
         # XXX caching?
         obj = self.obj
-        if hasattr(obj, 'compat_co_firstlineno'):
+        compat_co_firstlineno = getattr(obj, 'compat_co_firstlineno', None)
+        if isinstance(compat_co_firstlineno, int):
             # nose compatibility
             fspath = sys.modules[obj.__module__].__file__
             if fspath.endswith(".pyc"):
                 fspath = fspath[:-1]
-            lineno = obj.compat_co_firstlineno
+            lineno = compat_co_firstlineno
         else:
             fspath, lineno = getfslineno(obj)
         modpath = self.getmodpath()
diff --git a/testing/python/collect.py b/testing/python/collect.py
index 636f9597e..1a85faf9c 100644
--- a/testing/python/collect.py
+++ b/testing/python/collect.py
@@ -880,6 +880,21 @@ class TestReportInfo:
                     pass
        """
 
+    def test_reportinfo_with_nasty_getattr(self, testdir):
+        # https://github.com/pytest-dev/pytest/issues/1204
+        modcol = testdir.getmodulecol("""
+            # lineno 0
+            class TestClass:
+                def __getattr__(self, name):
+                    return "this is not an int"
+
+                def test_foo(self):
+                    pass
+        """)
+        classcol = testdir.collect_by_name(modcol, "TestClass")
+        instance = classcol.collect()[0]
+        fspath, lineno, msg = instance.reportinfo()
+
 
 def test_customized_python_discovery(testdir):
     testdir.makeini("""