diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 2a10c63..4633eb1 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -1218,6 +1218,7 @@
       ":libtint_builtins_src",
       ":libtint_constant_src",
       ":libtint_ir_src",
+      ":libtint_ir_transform_src",
       ":libtint_program_src",
       ":libtint_sem_src",
       ":libtint_symbols_src",
@@ -2192,7 +2193,9 @@
     sources = [
       "lang/msl/writer/ast_printer/array_accessor_test.cc",
       "lang/msl/writer/ast_printer/assign_test.cc",
+      "lang/msl/writer/ast_printer/ast_function_test.cc",
       "lang/msl/writer/ast_printer/ast_printer_test.cc",
+      "lang/msl/writer/ast_printer/ast_type_test.cc",
       "lang/msl/writer/ast_printer/binary_test.cc",
       "lang/msl/writer/ast_printer/bitcast_test.cc",
       "lang/msl/writer/ast_printer/block_test.cc",
@@ -2206,7 +2209,6 @@
       "lang/msl/writer/ast_printer/constructor_test.cc",
       "lang/msl/writer/ast_printer/continue_test.cc",
       "lang/msl/writer/ast_printer/discard_test.cc",
-      "lang/msl/writer/ast_printer/function_test.cc",
       "lang/msl/writer/ast_printer/identifier_test.cc",
       "lang/msl/writer/ast_printer/if_test.cc",
       "lang/msl/writer/ast_printer/import_test.cc",
@@ -2217,7 +2219,6 @@
       "lang/msl/writer/ast_printer/sanitizer_test.cc",
       "lang/msl/writer/ast_printer/switch_test.cc",
       "lang/msl/writer/ast_printer/test_helper.h",
-      "lang/msl/writer/ast_printer/type_test.cc",
       "lang/msl/writer/ast_printer/unary_op_test.cc",
       "lang/msl/writer/ast_printer/variable_decl_statement_test.cc",
       "lang/msl/writer/printer_support_test.cc",
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index 16cc0db..1f820de 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -1472,7 +1472,9 @@
     list(APPEND TINT_TEST_SRCS
       lang/msl/writer/ast_printer/array_accessor_test.cc
       lang/msl/writer/ast_printer/assign_test.cc
+      lang/msl/writer/ast_printer/ast_function_test.cc
       lang/msl/writer/ast_printer/ast_printer_test.cc
+      lang/msl/writer/ast_printer/ast_type_test.cc
       lang/msl/writer/ast_printer/binary_test.cc
       lang/msl/writer/ast_printer/bitcast_test.cc
       lang/msl/writer/ast_printer/block_test.cc
@@ -1486,7 +1488,6 @@
       lang/msl/writer/ast_printer/constructor_test.cc
       lang/msl/writer/ast_printer/continue_test.cc
       lang/msl/writer/ast_printer/discard_test.cc
-      lang/msl/writer/ast_printer/function_test.cc
       lang/msl/writer/ast_printer/identifier_test.cc
       lang/msl/writer/ast_printer/if_test.cc
       lang/msl/writer/ast_printer/import_test.cc
@@ -1496,10 +1497,9 @@
       lang/msl/writer/ast_printer/return_test.cc
       lang/msl/writer/ast_printer/sanitizer_test.cc
       lang/msl/writer/ast_printer/switch_test.cc
-      lang/msl/writer/ast_printer/type_test.cc
+      lang/msl/writer/ast_printer/test_helper.h
       lang/msl/writer/ast_printer/unary_op_test.cc
       lang/msl/writer/ast_printer/variable_decl_statement_test.cc
-      lang/msl/writer/ast_printer/test_helper.h
       lang/msl/writer/printer_support_test.cc
     )
 
diff --git a/src/tint/lang/msl/writer/ast_printer/function_test.cc b/src/tint/lang/msl/writer/ast_printer/ast_function_test.cc
similarity index 100%
rename from src/tint/lang/msl/writer/ast_printer/function_test.cc
rename to src/tint/lang/msl/writer/ast_printer/ast_function_test.cc
diff --git a/src/tint/lang/msl/writer/ast_printer/type_test.cc b/src/tint/lang/msl/writer/ast_printer/ast_type_test.cc
similarity index 100%
rename from src/tint/lang/msl/writer/ast_printer/type_test.cc
rename to src/tint/lang/msl/writer/ast_printer/ast_type_test.cc