diff --git a/mock_system_state.cc b/mock_system_state.cc
index d76de05..0ee9e5e 100644
--- a/mock_system_state.cc
+++ b/mock_system_state.cc
@@ -11,9 +11,10 @@
 // OOBE is completed even when there's no such marker file, etc.
 MockSystemState::MockSystemState()
   : default_request_params_(this),
+    clock_(&default_clock_),
+    hardware_(&default_hardware_),
     prefs_(&mock_prefs_),
     powerwash_safe_prefs_(&mock_powerwash_safe_prefs_) {
-  clock_ = &default_clock_;
   request_params_ = &default_request_params_;
   mock_payload_state_.Initialize(this);
   mock_gpio_handler_ = new testing::NiceMock<MockGpioHandler>();