diff --git a/src/Text/Pandoc/Class.hs b/src/Text/Pandoc/Class.hs
index bee529bd8..227505a23 100644
--- a/src/Text/Pandoc/Class.hs
+++ b/src/Text/Pandoc/Class.hs
@@ -513,9 +513,7 @@ instance PandocMonad PandocIO where
   putCommonState x = PandocIO $ lift $ put x
   logOutput msg = liftIO $ do
     UTF8.hPutStr stderr $
-       case messageVerbosity msg of
-           WARNING -> "!! "
-           _       -> ".. "
+        "[" ++ show (messageVerbosity msg) ++ "] "
     alertIndent $ lines $ showLogMessage msg
 
 alertIndent :: [String] -> IO ()
@@ -523,7 +521,7 @@ alertIndent [] = return ()
 alertIndent (l:ls) = do
   UTF8.hPutStrLn stderr l
   mapM_ go ls
-  where go l' = do UTF8.hPutStr stderr "   "
+  where go l' = do UTF8.hPutStr stderr "  "
                    UTF8.hPutStrLn stderr l'
 
 -- | Specialized version of parseURIReference that disallows
diff --git a/test/command/1718.md b/test/command/1718.md
index f642e64bf..7e07bf1e9 100644
--- a/test/command/1718.md
+++ b/test/command/1718.md
@@ -6,6 +6,6 @@ Note[^1].
 
 [^2]: the second, unused, note.
 ^D
-!! Note with key '2' defined at line 5 column 1 but not used.
+[WARNING] Note with key '2' defined at line 5 column 1 but not used.
 [Para [Str "Note",Note [Para [Str "the",Space,Str "first",Space,Str "note."]],Str "."]]
 ```
diff --git a/test/command/512.md b/test/command/512.md
index 2621c8e27..b95921309 100644
--- a/test/command/512.md
+++ b/test/command/512.md
@@ -36,7 +36,7 @@ Loop detection:
 
 __ link1_
 ^D
-!! Circular reference 'link1' at line 1 column 15
+[WARNING] Circular reference 'link1' at line 1 column 15
 <p><a href="">click here</a></p>
 ```
 
diff --git a/test/command/svg.md b/test/command/svg.md
index 5ddde2e56..26a8213f6 100644
--- a/test/command/svg.md
+++ b/test/command/svg.md
@@ -2,7 +2,7 @@
 % pandoc -f latex -t icml
 \includegraphics{command/corrupt.svg}
 ^D
-!! Could not determine image size for 'command/corrupt.svg': could not determine image type
+[WARNING] Could not determine image size for 'command/corrupt.svg': could not determine image type
 <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
   <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
     <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100">
@@ -35,7 +35,7 @@
 % pandoc -f latex -t icml
 \includegraphics{command/SVG_logo.svg}
 ^D
-!! Could not determine image size for 'command/SVG_logo.svg': could not determine SVG size
+[WARNING] Could not determine image size for 'command/SVG_logo.svg': could not determine SVG size
 <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
   <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
     <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100">
@@ -68,7 +68,7 @@
 % pandoc -f latex -t icml
 \includegraphics{command/SVG_logo-without-xml-declaration.svg}
 ^D
-!! Could not determine image size for 'command/SVG_logo-without-xml-declaration.svg': could not determine SVG size
+[WARNING] Could not determine image size for 'command/SVG_logo-without-xml-declaration.svg': could not determine SVG size
 <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
   <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
     <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100">