diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 9292a77..b279df2 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -90,6 +90,16 @@
   END
   CheckScriptSuccess(lines)
 
+  lines =<< trim END
+      vim9script
+      var name = v:false ?  # comment
+      		'yes' :
+                # comment
+		'no' # comment
+      assert_equal('no', name)
+  END
+  CheckScriptSuccess(lines)
+
   # check white space
   lines =<< trim END
       vim9script
@@ -279,6 +289,17 @@
   END
   CheckScriptSuccess(lines)
 
+  lines =<< trim END
+      vim9script
+      var name = v:false || # comment
+                # comment
+      		v:true ||
+                # comment
+		v:false # comment
+      assert_equal(v:true, name)
+  END
+  CheckScriptSuccess(lines)
+
   # check white space
   lines =<< trim END
       vim9script
@@ -405,6 +426,17 @@
   END
   CheckScriptSuccess(lines)
 
+  lines =<< trim END
+      vim9script
+      var name = v:true &&  # comment
+                # comment
+      		v:true &&
+                # comment
+      		v:true
+      assert_equal(v:true, name)
+  END
+  CheckScriptSuccess(lines)
+
   # check white space
   lines =<< trim END
       vim9script
@@ -800,6 +832,7 @@
   lines =<< trim END
       vim9script
       var name = 123
+                # comment
       		!= 123
       assert_equal(false, name)
   END
@@ -824,6 +857,16 @@
 
   lines =<< trim END
       vim9script
+      var list = [1, 2, 3]
+      var name = list # comment
+                 # comment
+      		is list
+      assert_equal(true, name)
+  END
+  CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
       var myblob = 0z1234
       var name = myblob
       		isnot 0z11
@@ -1059,6 +1102,16 @@
 
   lines =<< trim END
       vim9script
+      var name = 11 +  # comment
+		  77 -
+                  # comment
+		  22
+      assert_equal(66, name)
+  END
+  CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
       var name = 'one'
       		.. 'two'
       assert_equal('onetwo', name)
@@ -1305,6 +1358,17 @@
 
   lines =<< trim END
       vim9script
+      var name = 25
+                # comment
+
+                # comment
+      		% 10
+      assert_equal(5, name)
+  END
+  CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
       var name = 11 *
       		22 /
 		3
@@ -1618,6 +1682,12 @@
       echo [1,
 	    2] [3,
 		    4]
+
+      echo [1, # comment
+            # comment
+	    2] [3,
+            # comment
+		    4]
   END
   CheckScriptSuccess(lines)
 
@@ -1832,6 +1902,17 @@
 		'two': 2,
 		   }
       assert_equal({'one': 1, 'two': 2}, d)
+
+      d = {  # comment
+		'one':
+                # comment
+
+		   1,
+                # comment
+                # comment
+		'two': 2,
+		   }
+      assert_equal({'one': 1, 'two': 2}, d)
   END
   CheckScriptSuccess(lines)