diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 802bae363b..fb66809923 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -1531,11 +1531,35 @@ def Test_no_space_after_command()
       g /pat/cmd
   END
   CheckDefAndScriptFailure(lines, 'E1242:', 1)
+  lines =<< trim END
+      g #pat#cmd
+  END
+  CheckDefAndScriptFailure(lines, 'E1242:', 1)
+  lines =<< trim END
+      g#pat#cmd
+  END
+  CheckDefAndScriptSuccess(lines)
+  lines =<< trim END
+      g# pat#cmd
+  END
+  CheckDefAndScriptSuccess(lines)
 
   lines =<< trim END
       s /pat/repl
   END
   CheckDefAndScriptFailure(lines, 'E1242:', 1)
+  lines =<< trim END
+      s #pat#repl
+  END
+  CheckDefAndScriptFailure(lines, 'E1242:', 1)
+  lines =<< trim END
+      s#pat#repl
+  END
+  CheckDefExecAndScriptFailure(lines, 'E486:', 1)
+  lines =<< trim END
+      s# pat#repl
+  END
+  CheckDefExecAndScriptFailure(lines, 'E486:', 1)
 enddef
 
 
diff --git a/src/version.c b/src/version.c
index 7fa96b0404..a4a2363040 100644
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3506,
 /**/
     3505,
 /**/