diff --git a/AUTHORS b/AUTHORS
index f4a21b22dd4..e25d1727ab7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,6 +3,7 @@ merlinux GmbH, Germany, office at merlinux eu
 
 Contributors include::
 
+Abdeali JK
 Abhijeet Kasurde
 Anatoly Bubenkoff
 Andreas Zeidler
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ab5da9d01c2..ff921d1064f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,9 @@
 
 *
 
+* Support nose-style ``__test__`` attribute on methods of classes.
+  If set to False, the test will not be collected.
+
 * Fix win32 path issue when puttinging custom config file with absolute path 
   in ``pytest.main("-c your_absolute_path")``.
 
diff --git a/_pytest/unittest.py b/_pytest/unittest.py
index 8120e94fbf4..f24b496242a 100644
--- a/_pytest/unittest.py
+++ b/_pytest/unittest.py
@@ -50,6 +50,8 @@ def collect(self):
         foundsomething = False
         for name in loader.getTestCaseNames(self.obj):
             x = getattr(self.obj, name)
+            if not getattr(x, '__test__', True):
+                continue
             funcobj = getattr(x, 'im_func', x)
             transfer_markers(funcobj, cls, module)
             yield TestCaseFunction(name, parent=self)
diff --git a/testing/test_unittest.py b/testing/test_unittest.py
index 144aad79bf4..73735b8cd0d 100644
--- a/testing/test_unittest.py
+++ b/testing/test_unittest.py
@@ -735,3 +735,17 @@ def test_skip(self):
         *SKIP*[1]*skipping due to reasons*
         *1 skipped*
     """)
+
+def test_class_method_containing_test_issue1558(testdir):
+    testdir.makepyfile(test_foo="""
+        import unittest
+
+        class MyTestCase(unittest.TestCase):
+            def test_should_run(self):
+                pass
+            def test_should_not_run(self):
+                pass
+            test_should_not_run.__test__ = False
+    """)
+    reprec = testdir.inline_run()
+    reprec.assertoutcome(passed=1)