diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 9a89c90..0a19e54 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -30,6 +30,7 @@
 
 namespace {
 const char kDeviceName[] = "eth0";
+const char kHostName[] = "hostname";
 }  // namespace {}
 
 class DHCPConfigTest : public PropertyStoreTest {
@@ -41,6 +42,7 @@
                                dispatcher(),
                                DHCPProvider::GetInstance(),
                                kDeviceName,
+                               kHostName,
                                glib())) {}
 
   virtual void SetUp() {
@@ -152,6 +154,47 @@
   EXPECT_EQ(0, config_->pid_);
 }
 
+MATCHER_P(IsDHCPCDArgs, has_hostname, "") {
+  if (string(arg[0]) != "/sbin/dhcpcd" ||
+      string(arg[1]) != "-B" ||
+      string(arg[2]) != kDeviceName) {
+    return false;
+  }
+
+  if (has_hostname) {
+    if (string(arg[3]) != "-h" ||
+        string(arg[4]) != kHostName ||
+        arg[5] != NULL) {
+      return false;
+    }
+  } else {
+      if (arg[3] != NULL) {
+        return false;
+      }
+  }
+
+  return true;
+}
+
+TEST_F(DHCPConfigTest, StartWithHostname) {
+  EXPECT_CALL(*glib(), SpawnAsync(_, IsDHCPCDArgs(true), _, _, _, _, _, _))
+      .WillOnce(Return(false));
+  EXPECT_FALSE(config_->Start());
+}
+
+TEST_F(DHCPConfigTest, StartWithoutHostname) {
+  DHCPConfigRefPtr config(new DHCPConfig(&control_,
+                                         dispatcher(),
+                                         DHCPProvider::GetInstance(),
+                                         kDeviceName,
+                                         "",
+                                         glib()));
+
+  EXPECT_CALL(*glib(), SpawnAsync(_, IsDHCPCDArgs(false), _, _, _, _, _, _))
+      .WillOnce(Return(false));
+  EXPECT_FALSE(config->Start());
+}
+
 namespace {
 
 class UpdateCallbackTest {