diff --git a/integration_tests/index/test_search.py b/integration_tests/index/test_search.py
index 282518471d..eb915f3eeb 100644
--- a/integration_tests/index/test_search.py
+++ b/integration_tests/index/test_search.py
@@ -1107,7 +1107,11 @@ def matches_1(*args):
 
     def matches_none(*args):
         rows = _cli_csv_search(('datasets',) + args, clirunner)
-        assert len(lines) == 1
+        assert len(rows) == 0
+
+    def no_such_product(*args):
+        with pytest.raises(ValueError):
+            rows = _cli_csv_search(('datasets',) + args, clirunner)
 
     matches_both(' -40 < lat < -10')
     matches_both('product=' + pseudo_ls8_type.name)
@@ -1119,7 +1123,7 @@ def matches_none(*args):
     matches_1('platform=LANDSAT_8', '2014-07-24<time<2014-07-27')
 
     # One matching field, one non-matching
-    matches_none('2014-07-24<time<2014-07-27', 'platform=LANDSAT_5')
+    no_such_product('2014-07-24<time<2014-07-27', 'platform=LANDSAT_5')
 
     # Test date shorthand
     matches_both('2014-7 < time < 2014-8')