diff --git a/gematria/datasets/convert_bhive_to_llvm_exegesis_input.cc b/gematria/datasets/convert_bhive_to_llvm_exegesis_input.cc
index 8879df6fc5d7b6..8a239f1c3d7275 100644
--- a/gematria/datasets/convert_bhive_to_llvm_exegesis_input.cc
+++ b/gematria/datasets/convert_bhive_to_llvm_exegesis_input.cc
@@ -340,7 +340,7 @@ int main(int argc, char* argv[]) {
       }
     }
 
-    if (file_counter % report_progress_every == 0)
+    if (file_counter != 0 && file_counter % report_progress_every == 0)
       std::cerr << "Finished annotating block #" << file_counter << ".\n";
 
     file_counter++;
diff --git a/gematria/datasets/tests/report_progress.test b/gematria/datasets/tests/report_progress.test
new file mode 100644
index 00000000000000..05d5147f3dee59
--- /dev/null
+++ b/gematria/datasets/tests/report_progress.test
@@ -0,0 +1,22 @@
+; Test that the --report_progress_every reports progress at the expected
+; intervals.
+
+; RUN: split-file %s %t
+; RUN: mkdir %t.asmdir
+; RUN: %convert_bhive_to_llvm_exegesis_input --asm_output_dir=%t.asmdir --bhive_csv=%t/test.csv --report_progress_every=2 2>&1 | FileCheck %s
+
+; CHECK: Finished annotating block #2.
+; CHECK: Finished annotating block #4.
+
+; Test that --report_progress_every doesn't output anything with the default
+; value.
+; RUN: %convert_bhive_to_llvm_exegesis_input --asm_output_dir=%t.asmdir --bhive_csv=%t/test.csv 2>&1 | FileCheck %s --check-prefix=DEFAULT-VALUE
+
+; DEFAULT-VALUE-NOT: Finished annotating block
+
+;--- test.csv
+4183ff0119c083e00885c98945c4b8010000000f4fc139c2,298.000000
+4889de4889c24c89ff,93.000000
+48895d1844886520488945004889e84883c4085b5d415c415d,335.000000
+418b4424084d8b3424498d2cc64939ee,98.000000
+85c044897c2460,98.000000