diff --git a/README.md b/README.md
index 80bf1176f40d582e5393937d222c127b3c7d4e51..97b6f06458aab8387e2c40437a22d9dc97f369f1 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ import numpy as np
 
 f, g = ps.fields("f, g : [2D]")
 stencil = ps.Assignment(g[0, 0],
-                        (f[1, 0] + f[-1, 0] + f[0, 1] + f[0, -1]) / 4)
+                       (f[1, 0] + f[-1, 0] + f[0, 1] + f[0, -1]) / 4)
 kernel = ps.create_kernel(stencil).compile()
 
 f_arr = np.random.rand(1000, 1000)
diff --git a/conftest.py b/conftest.py
index cb17c79b1f5dfcffc12d8ffd822d17a9879aa97b..9395252282dddc476a3a9cad137945f62b052419 100644
--- a/conftest.py
+++ b/conftest.py
@@ -152,8 +152,7 @@ class IPyNbFile(pytest.File):
             warnings.filterwarnings("ignore", "IPython.core.inputsplitter is deprecated")
             notebook = nbformat.read(notebook_contents, 4)
             code, _ = exporter.from_notebook_node(notebook)
-        yield IPyNbTest(self.name, self, code)
-        # pytest v 2.4>: yield IPyNbTest.from_parent(name=self.name, parent=self, code=code)
+        yield IPyNbTest.from_parent(name=self.name, parent=self, code=code)
 
     def teardown(self):
         pass
@@ -162,5 +161,4 @@ class IPyNbFile(pytest.File):
 def pytest_collect_file(path, parent):
     glob_exprs = ["*demo*.ipynb", "*tutorial*.ipynb", "test_*.ipynb"]
     if any(path.fnmatch(g) for g in glob_exprs):
-        return IPyNbFile(path, parent)
-        # pytest v 2.4 >: return IPyNbFile.from_parent(fspath=path, parent=parent)
+        return IPyNbFile.from_parent(fspath=path, parent=parent)