diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 3cd16d231..05f795aa8 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.3.0.dev29'
+__version__ = '2.3.0.dev30'
diff --git a/_pytest/python.py b/_pytest/python.py
index 4f3c5e893..9c3091a7f 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1529,7 +1529,7 @@ class FixtureManager:
         self._holderobjseen.add(holderobj)
         autousenames = []
         for name in dir(holderobj):
-            obj = getattr(holderobj, name)
+            obj = getattr(holderobj, name, None)
             if not callable(obj):
                 continue
             # fixture functions have a pytest_funcarg__ prefix (pre-2.3 style)
diff --git a/setup.py b/setup.py
index 1a777f4a8..e445b0da2 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.3.0.dev29',
+        version='2.3.0.dev30',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
diff --git a/testing/test_unittest.py b/testing/test_unittest.py
index dfc812685..ffba9fa66 100644
--- a/testing/test_unittest.py
+++ b/testing/test_unittest.py
@@ -313,7 +313,7 @@ class TestTrialUnittest:
             "*i2wanto*",
             "*sys.version_info*",
             "*skip_in_method*",
-            "*4 skipped*3 xfail*1 xpass*",
+            "*5 skipped*3 xfail*1 xpass*",
         ])
 
     def test_trial_error(self, testdir):