diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
index 5ec022cf40..720116d136 100644
--- a/src/cmake/testing.cmake
+++ b/src/cmake/testing.cmake
@@ -199,7 +199,7 @@ macro (oiio_add_all_tests)
                     texture-filtersize
                     texture-filtersize-stochastic
                     texture-res texture-maxres
-                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images"
+                    IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images"
                    )
 
     # Add tests that require the Python bindings.
@@ -240,20 +240,20 @@ macro (oiio_add_all_tests)
                     IMAGEDIR oiio-images/bmpsuite)
     oiio_add_tests (cineon
                     ENABLEVAR ENABLE_CINEON
-                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+                    IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
     oiio_add_tests (dpx
                     ENABLEVAR ENABLE_DPX
-                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+                    IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
     oiio_add_tests (dds
                     ENABLEVAR ENABLE_DDS
-                    IMAGEDIR oiio-images/dds URL "Recent checkout of oiio-images")
+                    IMAGEDIR oiio-images/dds URL "Recent checkout of OpenImageIO-images")
     oiio_add_tests (fits
                     ENABLEVAR ENABLE_FITS
                     IMAGEDIR fits-images
                     URL http://www.cv.nrao.edu/fits/data/tests/)
     oiio_add_tests (gif
                     FOUNDVAR GIF_FOUND ENABLEVAR ENABLE_GIF
-                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+                    IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
     oiio_add_tests (hdr
                     ENABLEVAR ENABLE_HDR
                     IMAGEDIR openexr-images
@@ -265,13 +265,13 @@ macro (oiio_add_all_tests)
                     URL http://github.com/AcademySoftwareFoundation/openexr-images)
     oiio_add_tests (ico
                     ENABLEVAR ENABLE_ICO
-                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+                    IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
     oiio_add_tests (iff
                     ENABLEVAR ENABLE_IFF
-                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+                    IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
     oiio_add_tests (jpeg2000
                     FOUNDVAR OPENJPEG_FOUND
-                    IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+                    IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
     oiio_add_tests (jpeg2000-j2kp4files
                     FOUNDVAR OPENJPEG_FOUND
                     IMAGEDIR j2kp4files_v1_5
@@ -412,7 +412,8 @@ endfunction()
 
 function (oiio_setup_test_data)
     oiio_get_test_data (oiio-images
-                        REPO https://github.com/AcademySoftwareFoundation/OpenImageIO-images.git)
+                        REPO https://github.com/AcademySoftwareFoundation/OpenImageIO-images.git
+                        BRANCH dev-${OpenImageIO_VERSION_MAJOR}.${OpenImageIO_VERSION_MINOR})
     oiio_get_test_data (openexr-images
                         REPO https://github.com/AcademySoftwareFoundation/openexr-images.git
                         BRANCH main)