diff --git a/buffet/states/state_manager_unittest.cc b/buffet/states/state_manager_unittest.cc
index b035175..12d3845 100644
--- a/buffet/states/state_manager_unittest.cc
+++ b/buffet/states/state_manager_unittest.cc
@@ -16,13 +16,13 @@
 #include "buffet/states/error_codes.h"
 #include "buffet/states/mock_state_change_queue_interface.h"
 
-using buffet::unittests::CreateDictionaryValue;
-using buffet::unittests::ValueToString;
-using testing::Return;
-using testing::_;
-
 namespace buffet {
 
+using testing::_;
+using testing::Return;
+using unittests::CreateDictionaryValue;
+using unittests::ValueToString;
+
 namespace {
 std::unique_ptr<base::DictionaryValue> GetTestSchema() {
   return CreateDictionaryValue(R"({
diff --git a/buffet/states/state_package_unittest.cc b/buffet/states/state_package_unittest.cc
index d2d36e4..7856531 100644
--- a/buffet/states/state_package_unittest.cc
+++ b/buffet/states/state_package_unittest.cc
@@ -15,11 +15,11 @@
 #include "buffet/commands/unittest_utils.h"
 #include "buffet/states/error_codes.h"
 
-using buffet::unittests::CreateDictionaryValue;
-using buffet::unittests::ValueToString;
-
 namespace buffet {
 
+using unittests::CreateDictionaryValue;
+using unittests::ValueToString;
+
 class StatePackageTestHelper {
  public:
   // Returns the state property definitions (types/constraints/etc).