diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-check.cmake b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-check.cmake
similarity index 100%
rename from Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-check.cmake
rename to Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-check.cmake
diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt
similarity index 78%
rename from Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt
rename to Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt
index 110b36e78a..29984409f5 100644
--- a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt
+++ b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt
@@ -8,4 +8,4 @@ CPack: -   Install component: headers
 CPack: -   Install component: libraries
 CPack: Create package
 CPack: - package: [^
-]*/Tests/RunCMake/CPack_WIX/AppWiX-build/MyLib-1\.0\.0-(win64|windows-arm64)\.msi generated\.
+]*/Tests/RunCMake/CPack_WIX/3-AppWiX-build/MyLib-1\.0\.0-(win64|windows-arm64)\.msi generated\.
diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt b/Tests/RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt
rename to Tests/RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt
diff --git a/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake b/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake
index cd525d0218..cf14d7db9a 100644
--- a/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake
@@ -1,7 +1,16 @@
 include(RunCPack)
 
+set(env_PATH "$ENV{PATH}")
+
 set(RunCPack_GENERATORS WIX)
+set(RunCPack_GLOB *.msi)
+set(RunCPack_VERIFY powershell -ExecutionPolicy Bypass -File ${CMAKE_CURRENT_LIST_DIR}/print-msi.ps1)
 
-set(ENV{PATH} "${CMake_TEST_CPACK_WIX3};$ENV{PATH}")
+function(run_cpack_wix v)
+  run_cpack(${v}-AppWiX SAMPLE AppWiX BUILD)
+endfunction()
 
-run_cpack(AppWiX BUILD GLOB *.msi VERIFY powershell -ExecutionPolicy Bypass -File ${CMAKE_CURRENT_LIST_DIR}/print-msi.ps1)
+if(CMake_TEST_CPACK_WIX3)
+  set(ENV{PATH} "${CMake_TEST_CPACK_WIX3};${env_PATH}")
+  run_cpack_wix(3)
+endif()