diff --git a/src/Magnum/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp
index 8891674a8..640f9951a 100644
--- a/src/Magnum/Test/ImageTest.cpp
+++ b/src/Magnum/Test/ImageTest.cpp
@@ -23,15 +23,18 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+/* Included as first to check that we *really* don't need the StridedArrayView
+   header for definition of pixels() */
+#include "Magnum/Image.h"
+
 #include <sstream>
 #include <Corrade/Containers/StridedArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 
-#include "Magnum/Image.h"
 #include "Magnum/ImageView.h"
-#include "Magnum/Math/Color.h"
 #include "Magnum/PixelFormat.h"
+#include "Magnum/Math/Color.h"
 
 namespace Magnum { namespace Test { namespace {
 
diff --git a/src/Magnum/Test/ImageViewTest.cpp b/src/Magnum/Test/ImageViewTest.cpp
index 597e433cf..e9a7880de 100644
--- a/src/Magnum/Test/ImageViewTest.cpp
+++ b/src/Magnum/Test/ImageViewTest.cpp
@@ -23,14 +23,17 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+/* Included as first to check that we *really* don't need the StridedArrayView
+   header for definition of pixels() */
+#include "Magnum/ImageView.h"
+
 #include <sstream>
 #include <Corrade/Containers/StridedArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 
-#include "Magnum/Math/Color.h"
-#include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"
+#include "Magnum/Math/Color.h"
 
 namespace Magnum { namespace Test { namespace {
 
diff --git a/src/Magnum/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp
index 0248a63e4..4662288e0 100644
--- a/src/Magnum/Trade/Test/ImageDataTest.cpp
+++ b/src/Magnum/Trade/Test/ImageDataTest.cpp
@@ -23,15 +23,18 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+/* Included as first to check that we *really* don't need the StridedArrayView
+   header for definition of pixels() */
+#include "Magnum/Trade/ImageData.h"
+
 #include <sstream>
 #include <Corrade/Containers/StridedArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/ImageView.h"
-#include "Magnum/Math/Color.h"
 #include "Magnum/PixelFormat.h"
-#include "Magnum/Trade/ImageData.h"
+#include "Magnum/Math/Color.h"
 
 namespace Magnum { namespace Trade { namespace Test { namespace {