diff --git a/compiler-rt/lib/radsan/tests/CMakeLists.txt b/compiler-rt/lib/radsan/tests/CMakeLists.txt
index 3205f997256ab..73cedac2765d6 100644
--- a/compiler-rt/lib/radsan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/radsan/tests/CMakeLists.txt
@@ -42,7 +42,6 @@ if (APPLE)
   list(APPEND RADSAN_UNITTEST_LINK_FLAGS ${DARWIN_osx_LINK_FLAGS})
   list(APPEND RADSAN_UNITTEST_CFLAGS ${DARWIN_osx_CFLAGS})
 else()
-  #append_list_if(COMPILER_RT_HAS_LIBATOMIC -latomic RADSAN_UNITTEST_LINK_FLAGS)
   list(APPEND RADSAN_UNITTEST_LINK_FLAGS -latomic)
 endif()
 
@@ -54,8 +53,6 @@ if(APPLE)
 endif()
 
 foreach(arch ${RADSAN_TEST_ARCH})
-  set(arch ${COMPILER_RT_DEFAULT_TARGET_ARCH})
-
   set(RadsanTestObjects)
   generate_compiler_rt_tests(RadsanTestObjects
     RadsanUnitTests "Radsan-${arch}-Test" ${arch}
@@ -91,6 +88,7 @@ foreach(arch ${RADSAN_TEST_ARCH})
       ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
       FOLDER "Compiler-RT Runtime tests")
 
+  set(RadsanNoInstTestObjects)
   generate_compiler_rt_tests(RadsanNoInstTestObjects
     RadsanUnitTests "Radsan-${arch}-NoInstTest" ${arch}
     COMPILE_DEPS ${RADSAN_UNITTEST_HEADERS}
diff --git a/compiler-rt/test/radsan/CMakeLists.txt b/compiler-rt/test/radsan/CMakeLists.txt
index 79fca39f84b94..51a3ff72859b6 100644
--- a/compiler-rt/test/radsan/CMakeLists.txt
+++ b/compiler-rt/test/radsan/CMakeLists.txt
@@ -5,19 +5,12 @@ set(RADSAN_FDR_TESTSUITES)
 
 set(RADSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
 set(RADSAN_FDR_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
-
-# if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_BUILD_RADSAN AND
-#    COMPILER_RT_HAS_RADSAN)
-#   list(APPEND RADSAN_TEST_DEPS radsan llvm-xray)
-# endif()
-
 set(RADSAN_TEST_ARCH ${RADSAN_SUPPORTED_ARCH})
 if(APPLE)
   darwin_filter_host_archs(RADSAN_SUPPORTED_ARCH RADSAN_TEST_ARCH)
 endif()
 
 if (COMPILER_RT_HAS_RADSAN)
-  message ("SUPPORTED ARCHS: ${RADSAN_TEST_ARCH}")
   foreach(arch ${RADSAN_TEST_ARCH})
     set(RADSAN_TEST_TARGET_ARCH ${arch})
     string(TOLOWER "-${arch}-${OS_NAME}" RADSAN_TEST_CONFIG_SUFFIX)