diff --git a/client/crashpad_client_linux_test.cc b/client/crashpad_client_linux_test.cc
index 9610cddf0b..edfb5112df 100644
--- a/client/crashpad_client_linux_test.cc
+++ b/client/crashpad_client_linux_test.cc
@@ -85,12 +85,12 @@ TEST(CrashpadClient, SimulateCrash) {
     std::vector<CrashReportDatabase::Report> reports;
     ASSERT_EQ(database->GetPendingReports(&reports),
               CrashReportDatabase::kNoError);
-    EXPECT_EQ(reports.size(), 0u);
+    EXPECT_EQ(reports.size(), 1u);
 
     reports.clear();
     ASSERT_EQ(database->GetCompletedReports(&reports),
               CrashReportDatabase::kNoError);
-    EXPECT_EQ(reports.size(), 1u);
+    EXPECT_EQ(reports.size(), 0u);
   }
 }
 
@@ -147,11 +147,12 @@ class StartHandlerAtCrashTest : public MultiprocessExec {
     std::vector<CrashReportDatabase::Report> reports;
     ASSERT_EQ(database->GetPendingReports(&reports),
               CrashReportDatabase::kNoError);
-    EXPECT_EQ(reports.size(), 0u);
+    EXPECT_EQ(reports.size(), 1u);
 
+    reports.clear();
     ASSERT_EQ(database->GetCompletedReports(&reports),
               CrashReportDatabase::kNoError);
-    EXPECT_EQ(reports.size(), 1u);
+    EXPECT_EQ(reports.size(), 0u);
   }
 
   DISALLOW_COPY_AND_ASSIGN(StartHandlerAtCrashTest);
@@ -213,11 +214,12 @@ class StartHandlerForClientTest {
     std::vector<CrashReportDatabase::Report> reports;
     ASSERT_EQ(database->GetPendingReports(&reports),
               CrashReportDatabase::kNoError);
-    EXPECT_EQ(reports.size(), 0u);
+    EXPECT_EQ(reports.size(), 1u);
 
+    reports.clear();
     ASSERT_EQ(database->GetCompletedReports(&reports),
               CrashReportDatabase::kNoError);
-    EXPECT_EQ(reports.size(), 1u);
+    EXPECT_EQ(reports.size(), 0u);
   }
 
   bool InstallHandler() {
diff --git a/handler/crashpad_handler_test.cc b/handler/crashpad_handler_test.cc
index 79076b865d..9c468ddf21 100644
--- a/handler/crashpad_handler_test.cc
+++ b/handler/crashpad_handler_test.cc
@@ -93,7 +93,7 @@ void CrashWithExtendedHandler::ValidateGeneratedDump() {
   ASSERT_TRUE(database);
 
   std::vector<CrashReportDatabase::Report> reports;
-  ASSERT_EQ(database->GetCompletedReports(&reports),
+  ASSERT_EQ(database->GetPendingReports(&reports),
             CrashReportDatabase::kNoError);
   ASSERT_EQ(reports.size(), 1u);
 
diff --git a/handler/linux/crash_report_exception_handler.cc b/handler/linux/crash_report_exception_handler.cc
index e72819cdf2..2f38f2c09c 100644
--- a/handler/linux/crash_report_exception_handler.cc
+++ b/handler/linux/crash_report_exception_handler.cc
@@ -140,9 +140,6 @@ bool CrashReportExceptionHandler::HandleExceptionWithConnection(
 
     if (upload_thread_) {
       upload_thread_->ReportPending(uuid);
-    } else {
-      database_->SkipReportUpload(
-          uuid, Metrics::CrashSkippedReason::kUploadsDisabled);
     }
   }
 
diff --git a/handler/mac/crash_report_exception_handler.cc b/handler/mac/crash_report_exception_handler.cc
index edebf87aa2..9919e9557b 100644
--- a/handler/mac/crash_report_exception_handler.cc
+++ b/handler/mac/crash_report_exception_handler.cc
@@ -189,9 +189,6 @@ kern_return_t CrashReportExceptionHandler::CatchMachException(
 
     if (upload_thread_) {
       upload_thread_->ReportPending(uuid);
-    } else {
-      database_->SkipReportUpload(
-          uuid, Metrics::CrashSkippedReason::kUploadsDisabled);
     }
   }
 
diff --git a/handler/win/crash_report_exception_handler.cc b/handler/win/crash_report_exception_handler.cc
index 6d53d81057..d845c446ec 100644
--- a/handler/win/crash_report_exception_handler.cc
+++ b/handler/win/crash_report_exception_handler.cc
@@ -126,9 +126,6 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
 
     if (upload_thread_) {
       upload_thread_->ReportPending(uuid);
-    } else {
-      database_->SkipReportUpload(
-          uuid, Metrics::CrashSkippedReason::kUploadsDisabled);
     }
   }
 
diff --git a/snapshot/win/end_to_end_test.py b/snapshot/win/end_to_end_test.py
index a08cfd1ac7..fd602fbcf6 100755
--- a/snapshot/win/end_to_end_test.py
+++ b/snapshot/win/end_to_end_test.py
@@ -155,7 +155,7 @@ def GetDumpFromProgram(
     out = subprocess.check_output([
         os.path.join(out_dir, 'crashpad_database_util.exe'),
         '--database=' + test_database,
-        '--show-completed-reports',
+        '--show-pending-reports',
         '--show-all-report-info',
     ])
     for line in out.splitlines():