diff --git a/update_attempter.cc b/update_attempter.cc
index a1568a9..73b93b8 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -36,7 +36,8 @@
 
 namespace chromeos_update_engine {
 
-const char* kUpdateCompletedMarker = "/tmp/update_engine_autoupdate_completed";
+const char* kUpdateCompletedMarker =
+    "/var/run/update_engine_autoupdate_completed";
 
 const char* UpdateStatusToString(UpdateStatus status) {
   switch (status) {
diff --git a/update_attempter_unittest.cc b/update_attempter_unittest.cc
index 0a02d1c..ed58572 100644
--- a/update_attempter_unittest.cc
+++ b/update_attempter_unittest.cc
@@ -20,7 +20,7 @@
 namespace chromeos_update_engine {
 
 // Test a subclass rather than the main class directly so that we can mock out
-// methods within the class. There're explicit unit test for the mocked out
+// methods within the class. There're explicit unit tests for the mocked out
 // methods.
 class UpdateAttempterUnderTest : public UpdateAttempter {
  public:
@@ -52,7 +52,7 @@
   ActionProcessorMock* processor_;
 };
 
-TEST_F(UpdateAttempterTest, ConstructWithUpdatedMarkerTest) {
+TEST_F(UpdateAttempterTest, RunAsRootConstructWithUpdatedMarkerTest) {
   extern const char* kUpdateCompletedMarker;
   const FilePath kMarker(kUpdateCompletedMarker);
   EXPECT_EQ(0, file_util::WriteFile(kMarker, "", 0));