diff --git a/_pytest/python.py b/_pytest/python.py
index 67d5e5c52..4ff3f4fc0 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -406,7 +406,10 @@ class PyCollector(PyobjMixin, pytest.Collector):
         """ Look for the __test__ attribute, which is applied by the
         @nose.tools.istest decorator
         """
-        return safe_getattr(obj, '__test__', False)
+        # We explicitly check for "is True" here to not mistakenly treat
+        # classes with a custom __getattr__ returning something truthy (like a
+        # function) as test classes.
+        return safe_getattr(obj, '__test__', False) is True
 
     def classnamefilter(self, name):
         return self._matches_prefix_or_glob_option('python_classes', name)
diff --git a/testing/python/integration.py b/testing/python/integration.py
index 1b9be5968..0c436e32b 100644
--- a/testing/python/integration.py
+++ b/testing/python/integration.py
@@ -283,6 +283,35 @@ class TestNoselikeTestAttribute:
         assert len(call.items) == 1
         assert call.items[0].cls.__name__ == "TC"
 
+    def test_class_with_nasty_getattr(self, testdir):
+        """Make sure we handle classes with a custom nasty __getattr__ right.
+
+        With a custom __getattr__ which e.g. returns a function (like with a
+        RPC wrapper), we shouldn't assume this meant "__test__ = True".
+        """
+        # https://github.com/pytest-dev/pytest/issues/1204
+        testdir.makepyfile("""
+            class MetaModel(type):
+
+                def __getattr__(cls, key):
+                    return lambda: None
+
+
+            BaseModel = MetaModel('Model', (), {})
+
+
+            class Model(BaseModel):
+
+                __metaclass__ = MetaModel
+
+                def test_blah(self):
+                    pass
+        """)
+        reprec = testdir.inline_run()
+        assert not reprec.getfailedcollections()
+        call = reprec.getcalls("pytest_collection_modifyitems")[0]
+        assert not call.items
+
 
 @pytest.mark.issue351
 class TestParameterize: