diff --git a/src/coffee-script.coffee b/src/coffee-script.coffee
index 97f1652fc1..eb08b49f47 100644
--- a/src/coffee-script.coffee
+++ b/src/coffee-script.coffee
@@ -246,7 +246,7 @@ parser.yy = require './nodes'
 
 # Override Jison's default error handling function.
 parser.yy.parseError = (message, {token}) ->
-  # Disregard Jison's message, it contains redundant line numer information.
+  # Disregard Jison's message, it contains redundant line number information.
   # Disregard the token, we take its value directly from the lexer in case
   # the error is caused by a generated token which might refer to its origin.
   {errorToken, tokens} = parser
diff --git a/src/nodes.coffee b/src/nodes.coffee
index 2296ab8079..646f6c7743 100644
--- a/src/nodes.coffee
+++ b/src/nodes.coffee
@@ -1541,7 +1541,7 @@ exports.Code = class Code extends Base
 
 #### Param
 
-# A parameter in a function definition. Beyond a typical Javascript parameter,
+# A parameter in a function definition. Beyond a typical JavaScript parameter,
 # these parameters can also attach themselves to the context of the function,
 # as well as be a splat, gathering up a group of parameters into an array.
 exports.Param = class Param extends Base
diff --git a/test/error_messages.coffee b/test/error_messages.coffee
index 8782f8ec08..d279c4f73e 100644
--- a/test/error_messages.coffee
+++ b/test/error_messages.coffee
@@ -1,5 +1,5 @@
-# Error Formating
-# ---------------
+# Error Formatting
+# ----------------
 
 # Ensure that errors of different kinds (lexer, parser and compiler) are shown
 # in a consistent way.
@@ -10,7 +10,7 @@ assertErrorFormat = (code, expectedErrorFormat) ->
     eq expectedErrorFormat, "#{err}"
     yes
 
-test "lexer errors formating", ->
+test "lexer errors formatting", ->
   assertErrorFormat '''
     normalObject    = {}
     insideOutObject = }{
@@ -21,7 +21,7 @@ test "lexer errors formating", ->
                       ^
   '''
 
-test "parser error formating", ->
+test "parser error formatting", ->
   assertErrorFormat '''
     foo in bar or in baz
   ''',