diff --git a/src/Magnum/DebugTools/CompareImage.cpp b/src/Magnum/DebugTools/CompareImage.cpp
index 777743af9..429c8bbc3 100644
--- a/src/Magnum/DebugTools/CompareImage.cpp
+++ b/src/Magnum/DebugTools/CompareImage.cpp
@@ -203,6 +203,7 @@ void printDeltaImage(Debug& out, Containers::ArrayView<const Float> deltas, cons
     const Vector2i blockCount = (size + pixelsPerBlock - Vector2i{1})/pixelsPerBlock;
 
     for(std::int_fast32_t y = 0; y != blockCount.y(); ++y) {
+        if(y) out << Debug::newline;
         out << "          |";
 
         for(std::int_fast32_t x = 0; x != blockCount.x(); ++x) {
@@ -232,7 +233,7 @@ void printDeltaImage(Debug& out, Containers::ArrayView<const Float> deltas, cons
             else out << Debug::nospace << std::string{c};
         }
 
-        out << Debug::nospace << "|" << Debug::newline;
+        out << Debug::nospace << "|";
     }
 }
 
@@ -654,6 +655,7 @@ void ImageComparatorBase::printMessage(TestSuite::ComparisonStatusFlags, Debug&
 
         out << "Delta image:" << Debug::newline;
         DebugTools::Implementation::printDeltaImage(out, _state->delta, _state->expectedImage->size(), _state->max, _state->maxThreshold, _state->meanThreshold);
+        out << Debug::newline;
         CORRADE_INTERNAL_ASSERT(_state->actualFormat == _state->expectedImage->format());
         DebugTools::Implementation::printPixelDeltas(out, _state->delta, _state->actualFormat, _state->actualPixels, _state->expectedImage->pixels(), _state->maxThreshold, _state->meanThreshold, 10);
     }
diff --git a/src/Magnum/DebugTools/Test/CompareImageTest.cpp b/src/Magnum/DebugTools/Test/CompareImageTest.cpp
index 3e1eb5db1..f533a32cd 100644
--- a/src/Magnum/DebugTools/Test/CompareImageTest.cpp
+++ b/src/Magnum/DebugTools/Test/CompareImageTest.cpp
@@ -383,7 +383,7 @@ void CompareImageTest::deltaImage() {
         "          |,::::::~~~~===+++????77IIIZZZ$$$|\n"
         "          |,,,,,::::~~~===+++???777IIIZZZ$$|\n"
         "          |...,,,,:::~~~===+++??777IIIZZZ$$|\n"
-        "          | ....,,:::~~~===+++???777IIZZZ$$|\n");
+        "          | ....,,:::~~~===+++???777IIZZZ$$|");
 }
 
 void CompareImageTest::deltaImageScaling() {
@@ -406,15 +406,16 @@ void CompareImageTest::deltaImageScaling() {
         "          |::::~~~~===+++??777IIZZZ$$00088DD|\n"
         "          |,,::::~~~===++???777IIZZ$$$00888D|\n"
         "          |.,,,,:::~~===++???77IIZZZ$$000888|\n"
-        "          |...,,,::~~~==++???77IIIZZ$$000888|\n");
+        "          |...,,,::~~~==++???77IIIZZ$$000888|");
 }
 
 void CompareImageTest::deltaImageColors() {
     /* Print for visual color verification */
     {
-        Debug() << "Visual verification -- some letters should be yellow, some red, some white:";
-        Debug d{Debug::Flag::NoNewlineAtTheEnd};
-        Implementation::printDeltaImage(d, DeltaRed, {3, 3}, 2.0f, 0.5f, 0.2f);
+        Debug out;
+        out << "Visual verification -- some letters should be yellow, some red, some white:"
+            << Debug::newline;
+        Implementation::printDeltaImage(out, DeltaRed, {3, 3}, 2.0f, 0.5f, 0.2f);
     }
 
     std::ostringstream out;
@@ -424,7 +425,7 @@ void CompareImageTest::deltaImageColors() {
        preserve image ratio */
     CORRADE_COMPARE(out.str(),
         "          |.7 |\n"
-        "          |: ,|\n");
+        "          |: ,|");
 }
 
 void CompareImageTest::deltaImageSpecials() {
@@ -443,7 +444,7 @@ void CompareImageTest::deltaImageSpecials() {
        otherwise */
     CORRADE_COMPARE(out.str(),
         "          |MM |\n"
-        "          |~M8|\n");
+        "          |~M8|");
 }
 
 void CompareImageTest::pixelDelta() {