diff --git a/src/ast/builder.cc b/src/ast/builder.cc
index 957ce17c9b..fce7b913ba 100644
--- a/src/ast/builder.cc
+++ b/src/ast/builder.cc
@@ -26,7 +26,7 @@ Builder::~Builder() = default;
 std::unique_ptr<ast::Variable> Builder::make_var(const std::string& name,
                                                  ast::StorageClass storage,
                                                  ast::type::Type* type) {
-  auto var = std::make_unique<ast::Variable>(name, storage, type);
+  auto var = create<ast::Variable>(name, storage, type);
   return var;
 }
 
diff --git a/src/writer/spirv/builder_if_test.cc b/src/writer/spirv/builder_if_test.cc
index e86a6ac4fd..0842d76e2c 100644
--- a/src/writer/spirv/builder_if_test.cc
+++ b/src/writer/spirv/builder_if_test.cc
@@ -618,12 +618,12 @@ TEST_F(BuilderTest, If_WithLoad_Bug327) {
   // }
 
   ast::type::BoolType bool_type;
-  auto var = std::make_unique<ast::Variable>("a", ast::StorageClass::kFunction,
-                                             &bool_type);
+  auto var =
+      create<ast::Variable>("a", ast::StorageClass::kFunction, &bool_type);
   td.RegisterVariableForTesting(var.get());
 
-  ast::IfStatement expr(std::make_unique<ast::IdentifierExpression>("a"),
-                        std::make_unique<ast::BlockStatement>());
+  ast::IfStatement expr(create<ast::IdentifierExpression>("a"),
+                        create<ast::BlockStatement>());
 
   ASSERT_TRUE(td.DetermineResultType(&expr)) << td.error();