4 files changed, 26 insertions, 13 deletions
diff --git a/doc/source/f2py/allocarr_session.dat b/doc/source/f2py/allocarr_session.dat
index 754d9cb8b..ba168c22a 100644
--- a/doc/source/f2py/allocarr_session.dat
+++ b/doc/source/f2py/allocarr_session.dat
@@ -1,8 +1,11 @@
 >>> import allocarr
 >>> print(allocarr.mod.__doc__)
-b - 'f'-array(-1,-1), not allocated
-foo - Function signature:
-  foo()
+b : 'f'-array(-1,-1), not allocated
+foo()
+
+Wrapper for ``foo``.
+
+
 
 >>> allocarr.mod.foo()  
  b is not allocated
diff --git a/doc/source/f2py/common_session.dat b/doc/source/f2py/common_session.dat
index 0a38bec27..2595bfbd5 100644
--- a/doc/source/f2py/common_session.dat
+++ b/doc/source/f2py/common_session.dat
@@ -1,8 +1,8 @@
 >>> import common
 >>> print(common.data.__doc__)
-i - 'i'-scalar
-x - 'i'-array(4)
-a - 'f'-array(2,3)
+i : 'i'-scalar
+x : 'i'-array(4)
+a : 'f'-array(2,3)
 
 >>> common.data.i = 5
 >>> common.data.x[1] = 2 
diff --git a/doc/source/f2py/moddata_session.dat b/doc/source/f2py/moddata_session.dat
index e3c758041..824bd86fc 100644
--- a/doc/source/f2py/moddata_session.dat
+++ b/doc/source/f2py/moddata_session.dat
@@ -1,10 +1,14 @@
 >>> import moddata
 >>> print(moddata.mod.__doc__)
-i - 'i'-scalar
-x - 'i'-array(4)
-a - 'f'-array(2,3)
-foo - Function signature:
-  foo()
+i : 'i'-scalar
+x : 'i'-array(4)
+a : 'f'-array(2,3)
+b : 'f'-array(-1,-1), not allocated
+foo()
+
+Wrapper for ``foo``.
+
+
 
 >>> moddata.mod.i = 5  
 >>> moddata.mod.x[:2] = [1,2]
diff --git a/numpy/f2py/tests/test_module_doc.py b/numpy/f2py/tests/test_module_doc.py
index f597929ad..9360b04a9 100644
--- a/numpy/f2py/tests/test_module_doc.py
+++ b/numpy/f2py/tests/test_module_doc.py
@@ -1,7 +1,9 @@
 import os
-from . import util
+import sys
+import pytest
 
-from numpy.testing import assert_equal
+from . import util
+from numpy.testing import assert_equal, IS_PYPY
 
 
 def _path(*a):
@@ -11,6 +13,10 @@ def _path(*a):
 class TestModuleDocString(util.F2PyTest):
     sources = [_path('src', 'module_data', 'module_data_docstring.f90')]
 
+    @pytest.mark.skipif(sys.platform=='win32',
+                        reason='Fails with MinGW64 Gfortran (Issue #9673)')
+    @pytest.mark.xfail(IS_PYPY,
+                       reason="PyPy cannot modify tp_doc after PyType_Ready")
     def test_module_docstring(self):
         expected = "i : 'i'-scalar\nx : 'i'-array(4)\na : 'f'-array(2,3)\nb : 'f'-array(-1,-1), not allocated\x00\nfoo()\n\nWrapper for ``foo``.\n\n"
         assert_equal(self.module.mod.__doc__, expected)