diff --git a/AutomatedTests/CMakeLists.txt b/AutomatedTests/CMakeLists.txt
index 769a12faba..c1b14677d4 100644
--- a/AutomatedTests/CMakeLists.txt
+++ b/AutomatedTests/CMakeLists.txt
@@ -20,10 +20,23 @@ else()
 	endif()
 endif()
 
+if(CMAKE_SYSTEM_NAME MATCHES "RetroCarbon")
+    set(TESTCASE_PREFIX "Carbon.")
+elseif(CMAKE_SYSTEM_NAME MATCHES "Retro68")
+    set(TESTCASE_PREFIX "M68K.")
+elseif(CMAKE_SYSTEM_NAME MATCHES "RetroPPC")
+    set(TESTCASE_PREFIX "PPC.")
+else()
+    set(TESTCASE_PREFIX)
+endif()
+
 set(RETRO68_TEST_CONFIG "--timeout=10" CACHE String "Options to pass to LaunchAPPL when running tests")
 
+set(LAUNCH_METHOD_FLAG)
 if(RETRO68_LAUNCH_METHOD MATCHES "NONE")
-else() # extends to end of file
+else()
+set(LAUNCH_METHOD_FLAG "-e ${RETRO68_LAUNCH_METHOD}")
+endif()	# RETRO68_LAUNCH_METHOD
 
 enable_testing()
 
@@ -32,8 +45,11 @@ enable_testing()
 function(test FILE)
 	get_filename_component(NAME ${FILE} NAME_WE)
 	add_application(${NAME} ${FILE} Test.h Test.c)
-	add_test(NAME ${NAME} COMMAND ${LAUNCH_APPL}
-		-e ${RETRO68_LAUNCH_METHOD} ${RETRO68_TEST_CONFIG} ${ARGN} ${NAME}.bin)
+	add_test(NAME ${TESTCASE_PREFIX}${NAME} COMMAND ${LAUNCH_APPL}
+        ${LAUNCH_METHOD_FLAG} ${RETRO68_TEST_CONFIG} ${NAME}.bin)
+    if(ARGN)
+        set_tests_properties(${TESTCASE_PREFIX}${NAME} ${ARGN})
+    endif()
 endfunction()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Retro68")
@@ -43,32 +59,24 @@ endif()
 
 test(Empty.c)
 
-test(File.c)
-set_tests_properties(File PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+test(File.c PROPERTIES PASS_REGULAR_EXPRESSION "OK")
 
-test(Timeout.c)
-set_tests_properties(Timeout PROPERTIES PASS_REGULAR_EXPRESSION "One")
+test(Timeout.c PROPERTIES PASS_REGULAR_EXPRESSION "One")
 
-test(Log.c)
-set_tests_properties(Log PROPERTIES PASS_REGULAR_EXPRESSION "One\nTwo\nThree")
+test(Log.c PROPERTIES PASS_REGULAR_EXPRESSION "One\nTwo\nThree")
 
 test(ZeroInitialized.c)
-set_tests_properties(Log PROPERTIES PASS_REGULAR_EXPRESSION "One\nTwo\nThree")
 
+test(Init.cc PROPERTIES PASS_REGULAR_EXPRESSION "constructor\nmain\ndestructor")
 
-test(Init.cc)
-set_tests_properties(Init PROPERTIES PASS_REGULAR_EXPRESSION "constructor\nmain\ndestructor")
-
-test(StdIO.c)
-set_tests_properties(StdIO PROPERTIES PASS_REGULAR_EXPRESSION "OK")
+test(StdIO.c PROPERTIES PASS_REGULAR_EXPRESSION "OK")
 
 if(CMAKE_SYSTEM_NAME MATCHES Retro68)
 	add_application(Segments Segment1.c Segment2.c Segments.segmap Test.h Test.c)
 	set_target_properties(Segments PROPERTIES
 		LINK_FLAGS "-Wl,-gc-sections -Wl,--mac-segments -Wl,${CMAKE_CURRENT_SOURCE_DIR}/Segments.segmap")
-	add_test(NAME Segments COMMAND ${LAUNCH_APPL}
-		-e ${RETRO68_LAUNCH_METHOD} ${RETRO68_TEST_CONFIG} Segments.bin)
+	add_test(NAME ${TESTCASE_PREFIX}Segments COMMAND ${LAUNCH_APPL}
+        ${LAUNCH_METHOD_FLAG} ${RETRO68_TEST_CONFIG} Segments.bin)
 endif()
 
 
-endif()	# RETRO68_LAUNCH_METHOD
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58499c2d17..acfa7443d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,9 @@ set(CMAKE_C_STANDARD_REQUIRED TRUE)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type -Wno-multichar")
 
-if(CMAKE_SYSTEM_NAME MATCHES Retro.*)
+enable_testing()
 
+if(CMAKE_SYSTEM_NAME MATCHES Retro.*)
 
 set( REZ_TEMPLATES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libretro)
 include(add_application)
@@ -61,7 +62,6 @@ endif()
 
 add_subdirectory(LaunchAPPL)
 
-enable_testing()
 add_subdirectory(AutomatedTests)
 else()
 
diff --git a/Rez/Test/CMakeLists.txt b/Rez/Test/CMakeLists.txt
index a4aed2acce..f015e05e25 100644
--- a/Rez/Test/CMakeLists.txt
+++ b/Rez/Test/CMakeLists.txt
@@ -2,3 +2,4 @@ find_package(Boost COMPONENTS unit_test_framework)
 add_executable(RezUnitTests UnitTests.cc)
 target_link_libraries(RezUnitTests RezLib ${Boost_LIBRARIES})
 target_include_directories(RezUnitTests PRIVATE ${Boost_INCLUDE_DIR})
+add_test(NAME RezUnitTests COMMAND RezUnitTests)
diff --git a/build-toolchain.bash b/build-toolchain.bash
index 6694bfe6cd..4ff7ada5ab 100755
--- a/build-toolchain.bash
+++ b/build-toolchain.bash
@@ -443,6 +443,8 @@ cmake ${SRC} -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_BUILD_TYPE=Debug "${HOST_CMA
 cd ..
 cmake --build build-host --target install
 
+echo 'subdirs("build-host")' > CTestTestfile.cmake
+
 	# make tools (such as MakeImport and the compilers) available for later commands
 export PATH=$PREFIX/bin:$PATH
 
@@ -539,6 +541,7 @@ if [ $BUILD_68K != false ]; then
 	cd ..
 	cmake --build build-target --target install
 
+    echo 'subdirs("build-target")' >> CTestTestfile.cmake
 fi
 
 if [ $BUILD_PPC != false ]; then
@@ -552,6 +555,8 @@ if [ $BUILD_PPC != false ]; then
                  ${CMAKE_GENERATOR}
 	cd ..
 	cmake --build build-target-ppc --target install
+
+    echo 'subdirs("build-target-ppc")' >> CTestTestfile.cmake
 fi
 
 if [ $BUILD_CARBON != false ]; then
@@ -565,6 +570,8 @@ if [ $BUILD_CARBON != false ]; then
                  ${CMAKE_GENERATOR}
 	cd ..
 	cmake --build build-target-carbon --target install
+
+    echo 'subdirs("build-target-carbon")' >> CTestTestfile.cmake
 fi
 
 echo