diff --git a/bin-for-dist/py.test-in b/bin-for-dist/py.test-in
index 263b50f19..18843ff3c 100755
--- a/bin-for-dist/py.test-in
+++ b/bin-for-dist/py.test-in
@@ -47,6 +47,14 @@ class DictImporter(object):
         do_exec(co, module.__dict__)
         return sys.modules[fullname]
 
+    def get_source(self, name):
+        res = self.sources.get(name)
+        if res is None:
+            res = self.sources.get(name+'.__init__')
+        return res
+
+
+
 importer = DictImporter()
 
 sys.meta_path.append(importer)
diff --git a/py/apipkg.py b/py/apipkg.py
index 9e77bc744..b4d81342b 100644
--- a/py/apipkg.py
+++ b/py/apipkg.py
@@ -17,6 +17,7 @@ def initpkg(pkgname, exportdefs):
     mod.__file__ = getattr(oldmod, '__file__', None)
     mod.__version__ = getattr(oldmod, '__version__', None)
     mod.__path__ = getattr(oldmod, '__path__', None)
+    mod.__loader__ = getattr(oldmod, '__loader__', None)
     sys.modules[pkgname]  = mod
 
 def importobj(modpath, attrname):