diff --git a/tests/roots/test-image-glob/conf.py b/tests/roots/test-images/conf.py
similarity index 100%
rename from tests/roots/test-image-glob/conf.py
rename to tests/roots/test-images/conf.py
diff --git a/tests/roots/test-image-glob/img.gif b/tests/roots/test-images/img.gif
similarity index 100%
rename from tests/roots/test-image-glob/img.gif
rename to tests/roots/test-images/img.gif
diff --git a/tests/roots/test-image-glob/img.ja.png b/tests/roots/test-images/img.ja.png
similarity index 100%
rename from tests/roots/test-image-glob/img.ja.png
rename to tests/roots/test-images/img.ja.png
diff --git a/tests/roots/test-image-glob/img.pdf b/tests/roots/test-images/img.pdf
similarity index 100%
rename from tests/roots/test-image-glob/img.pdf
rename to tests/roots/test-images/img.pdf
diff --git a/tests/roots/test-image-glob/img.png b/tests/roots/test-images/img.png
similarity index 100%
rename from tests/roots/test-image-glob/img.png
rename to tests/roots/test-images/img.png
diff --git a/tests/roots/test-image-glob/img.zh.png b/tests/roots/test-images/img.zh.png
similarity index 100%
rename from tests/roots/test-image-glob/img.zh.png
rename to tests/roots/test-images/img.zh.png
diff --git a/tests/roots/test-image-glob/index.rst b/tests/roots/test-images/index.rst
similarity index 82%
rename from tests/roots/test-image-glob/index.rst
rename to tests/roots/test-images/index.rst
index d43e7e3ba..0e95b3c74 100644
--- a/tests/roots/test-image-glob/index.rst
+++ b/tests/roots/test-images/index.rst
@@ -1,5 +1,5 @@
-test-image-glob
-===============
+test-image
+==========
 
 .. image:: rimg.png
 
diff --git a/tests/roots/test-image-glob/rimg.png b/tests/roots/test-images/rimg.png
similarity index 100%
rename from tests/roots/test-image-glob/rimg.png
rename to tests/roots/test-images/rimg.png
diff --git a/tests/roots/test-image-glob/rimg.png.xx b/tests/roots/test-images/rimg.png.xx
similarity index 100%
rename from tests/roots/test-image-glob/rimg.png.xx
rename to tests/roots/test-images/rimg.png.xx
diff --git a/tests/roots/test-image-glob/rimg.xx.png b/tests/roots/test-images/rimg.xx.png
similarity index 100%
rename from tests/roots/test-image-glob/rimg.xx.png
rename to tests/roots/test-images/rimg.xx.png
diff --git a/tests/roots/test-image-glob/subdir/index.rst b/tests/roots/test-images/subdir/index.rst
similarity index 66%
rename from tests/roots/test-image-glob/subdir/index.rst
rename to tests/roots/test-images/subdir/index.rst
index 4ad2b0247..72e742c4a 100644
--- a/tests/roots/test-image-glob/subdir/index.rst
+++ b/tests/roots/test-images/subdir/index.rst
@@ -1,5 +1,5 @@
-test-image-glob/subdir
-======================
+test-images/subdir
+==================
 
 .. image:: rimg.png
 
diff --git a/tests/roots/test-image-glob/subdir/rimg.png b/tests/roots/test-images/subdir/rimg.png
similarity index 100%
rename from tests/roots/test-image-glob/subdir/rimg.png
rename to tests/roots/test-images/subdir/rimg.png
diff --git a/tests/roots/test-image-glob/subdir/rimg.xx.png b/tests/roots/test-images/subdir/rimg.xx.png
similarity index 100%
rename from tests/roots/test-image-glob/subdir/rimg.xx.png
rename to tests/roots/test-images/subdir/rimg.xx.png
diff --git a/tests/roots/test-image-glob/subdir/svgimg.pdf b/tests/roots/test-images/subdir/svgimg.pdf
similarity index 100%
rename from tests/roots/test-image-glob/subdir/svgimg.pdf
rename to tests/roots/test-images/subdir/svgimg.pdf
diff --git a/tests/roots/test-image-glob/subdir/svgimg.svg b/tests/roots/test-images/subdir/svgimg.svg
similarity index 100%
rename from tests/roots/test-image-glob/subdir/svgimg.svg
rename to tests/roots/test-images/subdir/svgimg.svg
diff --git a/tests/roots/test-image-glob/subdir/svgimg.xx.svg b/tests/roots/test-images/subdir/svgimg.xx.svg
similarity index 100%
rename from tests/roots/test-image-glob/subdir/svgimg.xx.svg
rename to tests/roots/test-images/subdir/svgimg.xx.svg
diff --git a/tests/roots/test-image-glob/testimäge.png b/tests/roots/test-images/testimäge.png
similarity index 100%
rename from tests/roots/test-image-glob/testimäge.png
rename to tests/roots/test-images/testimäge.png
diff --git a/tests/test_build.py b/tests/test_build.py
index 33e9196dd..221ea6462 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -102,7 +102,7 @@ def test_numbered_circular_toctree(app, status, warning):
         'contents <- sub <- contents') in warnings
 
 
-@pytest.mark.sphinx(buildername='dummy', testroot='image-glob')
+@pytest.mark.sphinx(buildername='dummy', testroot='images')
 def test_image_glob(app, status, warning):
     app.builder.build_all()
 
diff --git a/tests/test_intl.py b/tests/test_intl.py
index f03c771c9..cd5488779 100644
--- a/tests/test_intl.py
+++ b/tests/test_intl.py
@@ -1080,8 +1080,8 @@ def test_text_references(app, warning):
 
 
 @pytest.mark.sphinx(
-    'dummy', testroot='image-glob',
-    srcdir='test_intl_image_glob',
+    'dummy', testroot='images',
+    srcdir='test_intl_images',
     confoverrides={'language': 'xx'}
 )
 def test_image_glob_intl(app):
@@ -1124,8 +1124,8 @@ def test_image_glob_intl(app):
 
 
 @pytest.mark.sphinx(
-    'dummy', testroot='image-glob',
-    srcdir='test_intl_image_glob',
+    'dummy', testroot='images',
+    srcdir='test_intl_images',
     confoverrides={
         'language': 'xx',
         'figure_language_filename': u'{root}{ext}.{language}',