diff --git a/buffet/commands/command_definition_unittest.cc b/buffet/commands/command_definition_unittest.cc
index 0b06086..78520f8 100644
--- a/buffet/commands/command_definition_unittest.cc
+++ b/buffet/commands/command_definition_unittest.cc
@@ -6,11 +6,16 @@
 
 #include <gtest/gtest.h>
 
+using buffet::ObjectSchema;
+
 TEST(CommandDefinition, Test) {
-  auto params = std::make_shared<buffet::ObjectSchema>();
-  auto results = std::make_shared<buffet::ObjectSchema>();
-  buffet::CommandDefinition def("powerd", params, results);
+  std::unique_ptr<const ObjectSchema> params{ObjectSchema::Create()};
+  std::unique_ptr<const ObjectSchema> results{ObjectSchema::Create()};
+  const ObjectSchema* param_ptr = params.get();
+  const ObjectSchema* results_ptr = results.get();
+  buffet::CommandDefinition def{"powerd", std::move(params),
+                                std::move(results)};
   EXPECT_EQ("powerd", def.GetCategory());
-  EXPECT_EQ(params, def.GetParameters());
-  EXPECT_EQ(results, def.GetResults());
+  EXPECT_EQ(param_ptr, def.GetParameters());
+  EXPECT_EQ(results_ptr, def.GetResults());
 }