diff --git a/src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp
index 050cbf7c9..e589f7d8c 100644
--- a/src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp
+++ b/src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp
@@ -626,6 +626,8 @@ void CubeMapTextureArrayGLTest::view() {
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
         CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
@@ -650,6 +652,8 @@ void CubeMapTextureArrayGLTest::viewOnNonArray() {
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
         CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
diff --git a/src/Magnum/GL/Test/CubeMapTextureGLTest.cpp b/src/Magnum/GL/Test/CubeMapTextureGLTest.cpp
index cdbcbf2b2..6cfcacc2e 100644
--- a/src/Magnum/GL/Test/CubeMapTextureGLTest.cpp
+++ b/src/Magnum/GL/Test/CubeMapTextureGLTest.cpp
@@ -754,6 +754,8 @@ void CubeMapTextureGLTest::storageImageSize() {
 #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
 void CubeMapTextureGLTest::view() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
@@ -776,6 +778,8 @@ void CubeMapTextureGLTest::viewOnArray() {
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
         CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
diff --git a/src/Magnum/GL/Test/MultisampleTextureGLTest.cpp b/src/Magnum/GL/Test/MultisampleTextureGLTest.cpp
index 7cd6e6bfc..1a7db136f 100644
--- a/src/Magnum/GL/Test/MultisampleTextureGLTest.cpp
+++ b/src/Magnum/GL/Test/MultisampleTextureGLTest.cpp
@@ -411,6 +411,8 @@ void MultisampleTextureGLTest::storage2DArray() {
 
 void MultisampleTextureGLTest::view2D() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage_multisample>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage_multisample::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
@@ -433,6 +435,8 @@ void MultisampleTextureGLTest::view2D() {
 
 void MultisampleTextureGLTest::view2DOnArray() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage_multisample>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage_multisample::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
@@ -457,6 +461,8 @@ void MultisampleTextureGLTest::view2DOnArray() {
 
 void MultisampleTextureGLTest::view2DArray() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage_multisample>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage_multisample::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
@@ -481,6 +487,8 @@ void MultisampleTextureGLTest::view2DArray() {
 
 void MultisampleTextureGLTest::view2DArrayOnNonArray() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage_multisample>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage_multisample::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>())
         CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
diff --git a/src/Magnum/GL/Test/RectangleTextureGLTest.cpp b/src/Magnum/GL/Test/RectangleTextureGLTest.cpp
index 6bf9c68cb..0c68140ec 100644
--- a/src/Magnum/GL/Test/RectangleTextureGLTest.cpp
+++ b/src/Magnum/GL/Test/RectangleTextureGLTest.cpp
@@ -359,6 +359,8 @@ void RectangleTextureGLTest::storage() {
 }
 
 void RectangleTextureGLTest::view() {
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
 
diff --git a/src/Magnum/GL/Test/TextureArrayGLTest.cpp b/src/Magnum/GL/Test/TextureArrayGLTest.cpp
index ec139230a..bd11c3c40 100644
--- a/src/Magnum/GL/Test/TextureArrayGLTest.cpp
+++ b/src/Magnum/GL/Test/TextureArrayGLTest.cpp
@@ -964,6 +964,8 @@ void TextureArrayGLTest::storage2D() {
 #ifndef MAGNUM_TARGET_WEBGL
 #ifndef MAGNUM_TARGET_GLES
 void TextureArrayGLTest::view1D() {
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
 
@@ -978,6 +980,8 @@ void TextureArrayGLTest::view1D() {
 }
 
 void TextureArrayGLTest::view1DOnNonArray() {
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
 
@@ -994,6 +998,8 @@ void TextureArrayGLTest::view1DOnNonArray() {
 
 void TextureArrayGLTest::view2D() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
@@ -1014,6 +1020,8 @@ void TextureArrayGLTest::view2D() {
 
 void TextureArrayGLTest::view2DOnNonArray() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
@@ -1034,6 +1042,8 @@ void TextureArrayGLTest::view2DOnNonArray() {
 
 void TextureArrayGLTest::view2DOnCubeMap() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
@@ -1056,6 +1066,8 @@ void TextureArrayGLTest::view2DOnCubeMapArray() {
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
         CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
diff --git a/src/Magnum/GL/Test/TextureGLTest.cpp b/src/Magnum/GL/Test/TextureGLTest.cpp
index 4713822c9..c864a3b14 100644
--- a/src/Magnum/GL/Test/TextureGLTest.cpp
+++ b/src/Magnum/GL/Test/TextureGLTest.cpp
@@ -1443,6 +1443,8 @@ void TextureGLTest::storage3D() {
 #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
 #ifndef MAGNUM_TARGET_GLES
 void TextureGLTest::view1D() {
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
 
@@ -1459,6 +1461,8 @@ void TextureGLTest::view1D() {
 
 void TextureGLTest::view2D() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
@@ -1479,6 +1483,8 @@ void TextureGLTest::view2D() {
 
 void TextureGLTest::view2DOnArray() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
@@ -1499,6 +1505,8 @@ void TextureGLTest::view2DOnArray() {
 
 void TextureGLTest::view2DOnCubeMap() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
@@ -1521,6 +1529,8 @@ void TextureGLTest::view2DOnCubeMapArray() {
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
         CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else
@@ -1543,6 +1553,8 @@ void TextureGLTest::view2DOnCubeMapArray() {
 
 void TextureGLTest::view3D() {
     #ifndef MAGNUM_TARGET_GLES
+    if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
+        CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
         CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
     #else