diff --git a/parse.y b/parse.y
index 898f9fb02d..89e3d5b647 100644
--- a/parse.y
+++ b/parse.y
@@ -7480,9 +7480,11 @@ parse_numvar(struct parser_params *p)
 static enum yytokentype
 parse_gvar(struct parser_params *p, const enum lex_state_e last_state)
 {
+    const char *ptr = p->lex.pcur;
     register int c;
 
     SET_LEX_STATE(EXPR_END);
+    p->lex.ptok = ptr - 1; /* from '$' */
     newtok(p);
     c = nextc(p);
     switch (c) {
@@ -7560,6 +7562,7 @@ parse_gvar(struct parser_params *p, const enum lex_state_e last_state)
 
       default:
 	if (!parser_is_identchar(p)) {
+	    YYLTYPE loc = RUBY_INIT_YYLLOC();
 	    if (c == -1 || ISSPACE(c)) {
 		compile_error(p, "`$' without identifiers is not allowed as a global variable name");
 	    }
@@ -7567,6 +7570,7 @@ parse_gvar(struct parser_params *p, const enum lex_state_e last_state)
 		pushback(p, c);
 		compile_error(p, "`$%c' is not allowed as a global variable name", c);
 	    }
+	    parser_show_error_line(p, &loc);
 	    return 0;
 	}
       case '0':
diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb
index ea5065960a..a8389705af 100644
--- a/test/ruby/test_parse.rb
+++ b/test/ruby/test_parse.rb
@@ -377,9 +377,9 @@ class TestParse < Test::Unit::TestCase
   end
 
   def assert_disallowed_variable(type, noname, *invalid)
-    assert_syntax_error(noname, "`#{noname}' without identifiers is not allowed as #{type} variable name")
+    assert_syntax_error("a = #{noname}", "`#{noname}' without identifiers is not allowed as #{type} variable name")
     invalid.each do |name|
-      assert_syntax_error(name, "`#{name}' is not allowed as #{type} variable name")
+      assert_syntax_error("a = #{name}", "`#{name}' is not allowed as #{type} variable name")
     end
   end
 
@@ -712,7 +712,9 @@ x = __ENCODING__
     $test_parse_foobarbazqux = nil
     assert_equal(nil, $&)
     assert_equal(nil, eval('alias $& $preserve_last_match'))
-    assert_raise(SyntaxError) { eval('$#') }
+    assert_raise_with_message(SyntaxError, /as a global variable name\na = \$\#\n    \^~$/) do
+      eval('a = $#')
+    end
   end
 
   def test_invalid_instance_variable