diff --git a/sphinx/environment.py b/sphinx/environment.py
index 21994a746..fd171d443 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -80,7 +80,7 @@ class WarningStream(object):
         self.warnfunc = warnfunc
     def write(self, text):
         if text.strip():
-            self.warnfunc(text, None, '')
+            self.warnfunc(text.strip(), None, '')
 
 
 class NoUri(Exception):
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 4dee513ae..65c1840ea 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -12,6 +12,7 @@
 import os
 import re
 import htmlentitydefs
+import sys
 from StringIO import StringIO
 
 try:
@@ -60,6 +61,10 @@ def tail_check(check):
     return checker
 
 
+if sys.version_info >= (3, 0):
+    ENV_WARNINGS = remove_unicode_literals(ENV_WARNINGS)
+    HTML_WARNINGS = remove_unicode_literals(HTML_WARNINGS)
+
 HTML_XPATH = {
     'images.html': [
         (".//img[@src='_images/img.png']", ''),
diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
index 4405395a0..6c1ccad9b 100644
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
@@ -32,6 +32,9 @@ None:None: WARNING: no matching candidate for image URI u'foo.\\*'
 WARNING: invalid pair index entry u''
 """
 
+if sys.version_info >= (3, 0):
+    LATEX_WARNINGS = remove_unicode_literals(LATEX_WARNINGS)
+
 
 @with_app(buildername='latex', warning=latex_warnfile, cleanenv=True)
 def test_latex(app):
diff --git a/tests/util.py b/tests/util.py
index 2cf4a775b..950ea23f5 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -11,6 +11,7 @@ import sys
 import StringIO
 import tempfile
 import shutil
+import re
 from codecs import open
 
 try:
@@ -32,7 +33,7 @@ __all__ = [
     'raises', 'raises_msg', 'Struct',
     'ListOutput', 'TestApp', 'with_app', 'gen_with_app',
     'path', 'with_tempdir', 'write_file',
-    'sprint',
+    'sprint', 'remove_unicode_literals',
 ]
 
 
@@ -206,3 +207,7 @@ def write_file(name, contents, encoding=None):
 
 def sprint(*args):
     sys.stderr.write(' '.join(map(str, args)) + '\n')
+
+_unicode_literals_re = re.compile(r'u(".*")|u(\'.*\')')
+def remove_unicode_literals(s):
+    return _unicode_literals_re.sub(lambda x: x.group(1) or x.group(2), s)