diff --git a/src/engine/tcr_test.go b/src/engine/tcr_test.go
index 3b543eee..4ab576d9 100644
--- a/src/engine/tcr_test.go
+++ b/src/engine/tcr_test.go
@@ -398,6 +398,7 @@ func Test_tcr_cycle_end_state(t *testing.T) {
 	}
 }
 
+// FIXME SMELL: This test factory method is getting complicated with too many parameters. Consider refactoring to Builders.
 func initTCREngineWithFakesWithFileDiffs(
 	p *params.Params,
 	toolchainFailures toolchain.Operations,
diff --git a/src/report/reporter_test_util.go b/src/report/reporter_test_util.go
index 268fefee..c5c747d6 100644
--- a/src/report/reporter_test_util.go
+++ b/src/report/reporter_test_util.go
@@ -130,6 +130,10 @@ func (sniffer *Sniffer) Stop() {
 	}
 }
 
+// FIXME SMELL: Duplicated assertion code in tests. Consider improving the reporter fake as a real mock with
+//  check method and better error reporting, ex: report.assertWarning... instead of setting up the sniffer
+//  then asserting count matches
+
 // GetAllMatches returns a slice containing all matching messages captured by the sniffer
 func (sniffer *Sniffer) GetAllMatches() []Message {
 	return sniffer.captured