diff --git a/compiler/optimizing/codegen_test.cc b/compiler/optimizing/codegen_test.cc
index 879b4ce..e3f3df0 100644
--- a/compiler/optimizing/codegen_test.cc
+++ b/compiler/optimizing/codegen_test.cc
@@ -15,6 +15,7 @@
  */
 
 #include <functional>
+#include <memory>
 
 #include "arch/instruction_set.h"
 #include "arch/arm/instruction_set_features_arm.h"
@@ -299,8 +300,8 @@
                     bool has_result,
                     Expected expected) {
   CompilerOptions compiler_options;
-  CodeGenerator* codegen = target_config.CreateCodeGenerator(graph, compiler_options);
-  RunCode(codegen, graph, hook_before_codegen, has_result, expected);
+  std::unique_ptr<CodeGenerator> codegen(target_config.CreateCodeGenerator(graph, compiler_options));
+  RunCode(codegen.get(), graph, hook_before_codegen, has_result, expected);
 }
 
 #ifdef ART_ENABLE_CODEGEN_arm