diff --git a/scripts/validate/issues-for-todos.sh b/scripts/validate/issues-for-todos.sh
index 55e9153e1..41de14ac1 100755
--- a/scripts/validate/issues-for-todos.sh
+++ b/scripts/validate/issues-for-todos.sh
@@ -3,7 +3,7 @@
 cd $(git rev-parse --show-toplevel)
 
 
-if grep --line-number --include \*.hs -riP '(TODO|FIXME|XXX)\b' src app 2>&1 | grep -vP '#\d+'; then
+if grep --line-number --include \*.hs -riP '(TODO|FIXME|XXX)\b' src app test 2>&1 | grep -vP '#\d+'; then
   echo "Please add a link to Issue, for example: TODO: #123"
   exit 1
 else
diff --git a/test/integration/Main.hs b/test/integration/Main.hs
index b9e200b3e..a2c72b1ea 100644
--- a/test/integration/Main.hs
+++ b/test/integration/Main.hs
@@ -443,6 +443,7 @@ testScenarioSolutions rs ui key =
         , testGroup
             "Structure placement (#1780)"
             [ testSolution Default "Testing/1780-structure-merge-expansion/sequential-placement"
+            -- TODO(#2148) define goal conditions or convert to image fixtures
             -- , testSolution Default "Testing/1780-structure-merge-expansion/nonoverlapping-structure-merge"
             -- , testSolution Default "Testing/1780-structure-merge-expansion/root-map-expansion"
             -- , testSolution Default "Testing/1780-structure-merge-expansion/structure-composition"