diff --git a/py/doc/test_conftest.py.merge.tmp b/py/doc/test_conftest.py.merge.tmp
new file mode 100644
index 000000000..4c71bde92
--- /dev/null
+++ b/py/doc/test_conftest.py.merge.tmp
@@ -0,0 +1,73 @@
+
+import py
+
+def setup_module(mod): 
+    mod.tmpdir = py.test.ensuretemp('docdoctest')
+
+def test_doctest_basic(): 
+    # XXX get rid of the next line: 
+    py.magic.autopath().dirpath('conftest.py').copy(tmpdir.join('conftest.py'))
+
+    xtxt = tmpdir.join('x.txt')
+    xtxt.write(py.code.Source("""
+        .. 
+           >>> from os.path import abspath 
+
+        hello world 
+
+           >>> assert abspath 
+           >>> i=3
+           >>> print i
+           3
+
+        yes yes
+
+            >>> i
+            3
+
+        end
+    """))
+    config = py.test.config._reparse([xtxt]) 
+    session = config.initsession()
+    session.main()
+    l = session.getitemoutcomepairs(py.test.Item.Failed)
+    assert len(l) == 0 
+    l = session.getitemoutcomepairs(py.test.Item.Passed)
+    l2 = session.getitemoutcomepairs(py.test.Item.Skipped)
+    assert len(l+l2) == 2
+
+def test_js_ignore():
+    py.magic.autopath().dirpath('conftest.py').copy(tmpdir.join('conftest.py'))
+    tmpdir.ensure('__init__.py')
+    xtxt = tmpdir.join('x.txt')
+    xtxt.write(py.code.Source("""
+    `blah`_
+
+    .. _`blah`: javascript:some_function()
+    """))
+    config = py.test.config._reparse([xtxt]) 
+    session = config.initsession()
+    session.main()
+    l = session.getitemoutcomepairs(py.test.Item.Failed)
+    assert len(l) == 0 
+    l = session.getitemoutcomepairs(py.test.Item.Passed)
+    l2 = session.getitemoutcomepairs(py.test.Item.Skipped)
+    assert len(l+l2) == 3
+
+def test_resolve_linkrole():
+    from py.__.doc.conftest import resolve_linkrole
+    assert resolve_linkrole('api', 'py.foo.bar') == (
+        'py.foo.bar', '../../apigen/api/foo.bar.html')
+    assert resolve_linkrole('api', 'py.foo.bar()') == (
+        'py.foo.bar()', '../../apigen/api/foo.bar.html')
+    assert resolve_linkrole('api', 'py') == (
+        'py', '../../apigen/api/index.html')
+    py.test.raises(AssertionError, 'resolve_linkrole("api", "foo.bar")')
+    assert resolve_linkrole('source', 'py/foo/bar.py') == (
+        'py/foo/bar.py', '../../apigen/source/foo/bar.py.html')
+    assert resolve_linkrole('source', 'py/foo/') == (
+        'py/foo/', '../../apigen/source/foo/index.html')
+    assert resolve_linkrole('source', 'py/') == (
+        'py/', '../../apigen/source/index.html')
+    py.test.raises(AssertionError, 'resolve_linkrole("source", "/foo/bar/")')
+