diff --git a/_pytest/config.py b/_pytest/config.py
index aea6a98e7..e73452b25 100644
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -136,6 +136,7 @@ class PytestPluginManager(PluginManager):
     def __init__(self):
         super(PytestPluginManager, self).__init__("pytest", implprefix="pytest_")
         self._warnings = []
+        self._pushwarning = self._warnings.append
         self._conftest_plugins = set()
 
         # state related to local conftest plugins
@@ -166,7 +167,7 @@ class PytestPluginManager(PluginManager):
                        fslocation=py.code.getfslineno(sys._getframe(1)),
                        message="use pluginmanager.add_hookspecs instead of "
                                "deprecated addhooks() method.")
-        self._warnings.append(warning)
+        self._warn(warning)
         return self.add_hookspecs(module_or_class)
 
     def parse_hookimpl_opts(self, plugin, name):
@@ -196,9 +197,10 @@ class PytestPluginManager(PluginManager):
             fslineno = py.code.getfslineno(hookmethod.function)
             warning = dict(code="I1",
                            fslocation=fslineno,
+                           nodeid=None,
                            message="%r hook uses deprecated __multicall__ "
                                    "argument" % (hook.name))
-            self._warnings.append(warning)
+            self._warn(warning)
 
     def register(self, plugin, name=None):
         ret = super(PytestPluginManager, self).register(plugin, name)
@@ -224,11 +226,31 @@ class PytestPluginManager(PluginManager):
         config.addinivalue_line("markers",
             "trylast: mark a hook implementation function such that the "
             "plugin machinery will try to call it last/as late as possible.")
-        for warning in self._warnings:
-            if isinstance(warning, dict):
-                config.warn(**warning)
-            else:
-                config.warn(code="I1", message=warning)
+
+    def pytest_plugin_registered(self, plugin):
+        if self.get_name(plugin) == 'terminalreporter':
+            warnings = self._warnings
+            self._warnings = None
+            config = self.get_plugin('pytestconfig')
+
+            def pushwarning(args):
+                assert args.pop('nodeid', None) is None
+                config.warn(**args)
+
+            self._pushwarning = pushwarning
+            for warning in warnings:
+                config.hook.pytest_logwarning(**warning)
+
+    def _warn(self, message):
+        if isinstance(message, dict):
+            self._pushwarning(message)
+        else:
+            self._pushwarning({
+                'code': 'I1',
+                'message': message,
+                'fslocation': None,
+                'nodeid': None,
+            })
 
     #
     # internal API for local conftest plugin handling
@@ -381,7 +403,7 @@ class PytestPluginManager(PluginManager):
             import pytest
             if not hasattr(pytest, 'skip') or not isinstance(e, pytest.skip.Exception):
                 raise
-            self._warnings.append("skipped plugin %r: %s" %((modname, e.msg)))
+            self._warn("skipped plugin %r: %s" %((modname, e.msg)))
         else:
             mod = sys.modules[importspec]
             self.register(mod, modname)
@@ -793,6 +815,7 @@ class Config(object):
         self._inicache = {}
         self._opt2dest = {}
         self._cleanup = []
+        self._warn = self.pluginmanager._warn
         self.pluginmanager.register(self, "pytestconfig")
         self._configured = False
         def do_setns(dic):
@@ -914,8 +937,7 @@ class Config(object):
             if ns.help or ns.version:
                 # we don't want to prevent --help/--version to work
                 # so just let is pass and print a warning at the end
-                self.pluginmanager._warnings.append(
-                        "could not load initial conftests (%s)\n" % e.path)
+                self._warn("could not load initial conftests (%s)\n" % e.path)
             else:
                 raise
 
diff --git a/_pytest/helpconfig.py b/_pytest/helpconfig.py
index af35e241e..5ede8b371 100644
--- a/_pytest/helpconfig.py
+++ b/_pytest/helpconfig.py
@@ -62,8 +62,8 @@ def pytest_cmdline_main(config):
         return 0
 
 def showhelp(config):
-    import _pytest.config
-    tw = _pytest.config.create_terminal_writer(config)
+    reporter = config.pluginmanager.get_plugin('terminalreporter')
+    tw = reporter._tw
     tw.write(config._parser.optparser.format_help())
     tw.line()
     tw.line()
@@ -86,8 +86,9 @@ def showhelp(config):
     tw.line("to see available fixtures type: py.test --fixtures")
     tw.line("(shown according to specified file_or_dir or current dir "
             "if not specified)")
-    for warning in config.pluginmanager._warnings:
-        tw.line("warning: %s" % (warning,), red=True)
+    tw.line(str(reporter.stats))
+    for warningreport in reporter.stats.get('warnings', []):
+        tw.line("warning : " + warningreport.message, red=True)
     return
 
 
@@ -126,5 +127,3 @@ def pytest_report_header(config):
                 r = repr(plugin)
             lines.append("    %-20s: %s" %(name, r))
     return lines
-
-