diff --git a/build_tools/cmake/iree_cc_test.cmake b/build_tools/cmake/iree_cc_test.cmake
index f6045a3a21ef..d1dab7ff1fa4 100644
--- a/build_tools/cmake/iree_cc_test.cmake
+++ b/build_tools/cmake/iree_cc_test.cmake
@@ -105,16 +105,14 @@ function(iree_cc_test)
   set_property(GLOBAL APPEND PROPERTY _IREE_CC_BINARY_NAMES "${_NAME}")
   set_property(TARGET ${_NAME} PROPERTY DIRECT_DEPS ${_RULE_DEPS})
 
-  # We run all our tests through a custom test runner to allow temp directory
-  # cleanup upon test completion.
-
-  iree_package_ns(_PACKAGE_NS)
   string(REPLACE "::" "/" _PACKAGE_PATH ${_PACKAGE_NS})
   set(_NAME_PATH "${_PACKAGE_PATH}:${_RULE_NAME}")
   add_test(
     NAME
       ${_NAME_PATH}
     COMMAND
+      # We run all our tests through a custom test runner to allow temp
+      # directory cleanup upon test completion.
       "${CMAKE_SOURCE_DIR}/build_tools/cmake/run_test.${IREE_HOST_SCRIPT_EXT}"
       "$<TARGET_FILE:${_NAME}>"
     WORKING_DIRECTORY
diff --git a/build_tools/cmake/iree_lit_test.cmake b/build_tools/cmake/iree_lit_test.cmake
index f3fd68db5b2c..430dc7fa6062 100644
--- a/build_tools/cmake/iree_lit_test.cmake
+++ b/build_tools/cmake/iree_lit_test.cmake
@@ -58,7 +58,6 @@ function(iree_lit_test)
     endif()
   endforeach(_DATA_DEP)
 
-  # We run all our tests through a custom test runner to allow setup and teardown.
   iree_package_ns(_PACKAGE_NS)
   string(REPLACE "::" "/" _PACKAGE_PATH ${_PACKAGE_NS})
   set(_NAME_PATH "${_PACKAGE_PATH}:${_RULE_NAME}")
@@ -66,6 +65,8 @@ function(iree_lit_test)
     NAME
       ${_NAME_PATH}
     COMMAND
+      # We run all our tests through a custom test runner to allow setup
+      # and teardown.
       "${CMAKE_SOURCE_DIR}/build_tools/cmake/run_test.${IREE_HOST_SCRIPT_EXT}"
       "${CMAKE_SOURCE_DIR}/iree/tools/run_lit.${IREE_HOST_SCRIPT_EXT}"
       ${_TEST_FILE_PATH}