diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2a7ca63..1068bffd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 ## 2.3.8
 
-* Fix bug [#422](https://github.com/olivernn/lunr.js/issues/422) where a pipline function that returned null was not skipping the token as described in the documentation. Thanks [Stephen Cleary](https://github.com/StephenCleary) and [Rob Hoelz](https://github.com/hoelzro) for reporting and investigating.
+* Fix bug [#422](https://github.com/olivernn/lunr.js/issues/422) where a pipeline function that returned null was not skipping the token as described in the documentation. Thanks [Stephen Cleary](https://github.com/StephenCleary) and [Rob Hoelz](https://github.com/hoelzro) for reporting and investigating.
 
 ## 2.3.7
 
@@ -140,7 +140,7 @@
 * Replace array-like string access with ES3 compatible `String.prototype.charAt` [#186](https://github.com/olivernn/lunr.js/pull/186), thanks [jkellerer](https://github.com/jkellerer).
 * Move empty string filtering from `lunr.trimmer` to `lunr.Pipeline.prototype.run` so that empty tokens do not enter the index, regardless of the trimmer being used [#178](https://github.com/olivernn/lunr.js/issues/178), [#177](https://github.com/olivernn/lunr.js/issues/177) and [#174](https://github.com/olivernn/lunr.js/issues/174)
 * Allow tokenization of arrays with null and non string elements [#172](https://github.com/olivernn/lunr.js/issues/172).
-* Parameterize the seperator used by `lunr.tokenizer`, fixes [#102](https://github.com/olivernn/lunr.js/issues/102).
+* Parameterize the separator used by `lunr.tokenizer`, fixes [#102](https://github.com/olivernn/lunr.js/issues/102).
 
 ## 0.5.12
 
diff --git a/build/wrapper_end b/build/wrapper_end
index 380dd453..3880b536 100644
--- a/build/wrapper_end
+++ b/build/wrapper_end
@@ -10,7 +10,7 @@
     } else if (typeof exports === 'object') {
       /**
        * Node. Does not work with strict CommonJS, but
-       * only CommonJS-like enviroments that support module.exports,
+       * only CommonJS-like environments that support module.exports,
        * like Node.
        */
       module.exports = factory()
diff --git a/test/pipeline_test.js b/test/pipeline_test.js
index f080bf9d..8bd072bd 100644
--- a/test/pipeline_test.js
+++ b/test/pipeline_test.js
@@ -257,7 +257,7 @@ suite('lunr.Pipeline', function () {
       assert.equal(fn, pipeline._stack[0])
     })
 
-    test('with unregisterd functions', function () {
+    test('with unregistered functions', function () {
       var serializedPipeline = ['fn']
 
       assert.throws(function () {
diff --git a/test/query_lexer_test.js b/test/query_lexer_test.js
index d12cff6f..51e157d9 100644
--- a/test/query_lexer_test.js
+++ b/test/query_lexer_test.js
@@ -115,7 +115,7 @@ suite('lunr.QueryLexer', function () {
         this.lexer = lex('foo bar')
       })
 
-      test('produces 2 lexems', function () {
+      test('produces 2 lexemes', function () {
         assert.lengthOf(this.lexer.lexemes, 2)
       })
 
@@ -152,7 +152,7 @@ suite('lunr.QueryLexer', function () {
         this.lexer = lex('+foo +bar')
       })
 
-      test('produces 2 lexems', function () {
+      test('produces 2 lexemes', function () {
         assert.lengthOf(this.lexer.lexemes, 4)
       })
 
@@ -216,7 +216,7 @@ suite('lunr.QueryLexer', function () {
         this.lexer = lex('foo    bar')
       })
 
-      test('produces 2 lexems', function () {
+      test('produces 2 lexemes', function () {
         assert.lengthOf(this.lexer.lexemes, 2)
       })
 
@@ -248,7 +248,7 @@ suite('lunr.QueryLexer', function () {
       })
     })
 
-    suite('hyphen (-) considered a seperator', function () {
+    suite('hyphen (-) considered a separator', function () {
       setup(function () {
         this.lexer = lex('foo-bar')
       })
@@ -263,7 +263,7 @@ suite('lunr.QueryLexer', function () {
         this.lexer = lex('title:foo')
       })
 
-      test('produces 2 lexems', function () {
+      test('produces 2 lexemes', function () {
         assert.lengthOf(this.lexer.lexemes, 2)
       })
 
@@ -453,7 +453,7 @@ suite('lunr.QueryLexer', function () {
         this.lexer = lex('foo~2')
       })
 
-      test('produces 2 lexems', function () {
+      test('produces 2 lexemes', function () {
         assert.lengthOf(this.lexer.lexemes, 2)
       })
 
@@ -490,7 +490,7 @@ suite('lunr.QueryLexer', function () {
         this.lexer = lex('foo^10')
       })
 
-      test('produces 2 lexems', function () {
+      test('produces 2 lexemes', function () {
         assert.lengthOf(this.lexer.lexemes, 2)
       })
 
@@ -527,7 +527,7 @@ suite('lunr.QueryLexer', function () {
         this.lexer = lex('title:foo^10~5')
       })
 
-      test('produces 4 lexems', function () {
+      test('produces 4 lexemes', function () {
         assert.lengthOf(this.lexer.lexemes, 4)
       })
 
diff --git a/test/token_set_test.js b/test/token_set_test.js
index c2f45b61..297f735d 100644
--- a/test/token_set_test.js
+++ b/test/token_set_test.js
@@ -58,8 +58,8 @@ suite('lunr.TokenSet', function () {
 
       // a state reached by a wildcard has
       // an edge with a wildcard to itself.
-      // the resulting automota is
-      // non-determenistic
+      // the resulting automata is
+      // non-deterministic
       assert.equal(wild, wild.edges['*'])
       assert.isOk(wild.final)
     })
diff --git a/test/utils_test.js b/test/utils_test.js
index f6bc7e54..b259dda5 100644
--- a/test/utils_test.js
+++ b/test/utils_test.js
@@ -25,7 +25,7 @@ suite('lunr.utils', function () {
       })
     })
 
-    suite('object with primatives', function () {
+    suite('object with primitives', function () {
       subject({
         number: 1,
         string: 'foo',
@@ -54,7 +54,7 @@ suite('lunr.utils', function () {
         assert.deepEqual(this.obj.array, this.clone.array)
       })
 
-      test('mutations on clone do not affect orginial', function () {
+      test('mutations on clone do not affect original', function () {
         this.clone.array.push(4)
         assert.notDeepEqual(this.obj.array, this.clone.array)
         assert.equal(this.obj.array.length, 3)